You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/09 15:32:25 UTC
[02/43] Revert "Merge and close PR #43"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..1710a22 100644
--- a/utils/common/src/main/java/brooklyn/util/time/Time.java
+++ b/utils/common/src/main/java/brooklyn/util/time/Time.java
@@ -1,21 +1,8 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * Copyright (c) 2009-2011 Cloudsoft Corporation Ltd. All rights reserved.
+ * Supplied under license http://www.cloudsoftcorp.com/license/montereyDeveloperEdition
+ * or such subsequent license agreed between Cloudsoft Corporation Ltd and the licensee.
+ */
package brooklyn.util.time;
import java.text.DateFormat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..b43d1b7 100644
--- a/utils/common/src/test/java/brooklyn/test/AssertsTest.java
+++ b/utils/common/src/test/java/brooklyn/test/AssertsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.test;
import java.util.concurrent.ExecutionException;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..05cdc95 100644
--- a/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java
+++ b/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.test;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..1650c9c 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.collections;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..a38dd24 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.collections;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..39dab82 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.collections;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..655bf78 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.collections;
import static brooklyn.util.time.Duration.ONE_MILLISECOND;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..45ff343 100644
--- a/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java
+++ b/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.guava;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..eab16e2 100644
--- a/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java
+++ b/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..6ebbe6a 100644
--- a/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..7c8ccf3 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.javalang;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..0d455bf 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.javalang;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..8203a26 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.javalang;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..0e685a2 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.javalang;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..77904bb 100644
--- a/utils/common/src/test/java/brooklyn/util/math/BitListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/BitListTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.math;
import java.math.BigInteger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..cfa8db7 100644
--- a/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.math;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..c7784a5 100644
--- a/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.math;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..592da36 100644
--- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
+++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.maven;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..8685f1b 100644
--- a/utils/common/src/test/java/brooklyn/util/net/CidrTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/CidrTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.net;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..f774b85 100644
--- a/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.net;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..00e24d3 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.net;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..6ece6d2 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.net;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..5ef694f 100644
--- a/utils/common/src/test/java/brooklyn/util/os/OsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/os/OsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.os;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..5591f2c 100644
--- a/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java
+++ b/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.pool;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..8d04785 100644
--- a/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java
+++ b/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.repeat;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..3a70c3f 100644
--- a/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.ssh;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..4ad208e 100644
--- a/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java
+++ b/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.stream;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..01bd622 100644
--- a/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java
@@ -1,21 +1,18 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Copyright 2009-2014 by Cloudsoft Corporation Limited
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package brooklyn.util.text;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..3c0870b 100644
--- a/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..64dbfc6 100644
--- a/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..bcc2276 100644
--- a/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java
@@ -1,21 +1,8 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * Copyright (c) 2009-2011 Cloudsoft Corporation Ltd. All rights reserved.
+ * Supplied under license http://www.cloudsoftcorp.com/license/montereyDeveloperEdition
+ * or such subsequent license agreed between Cloudsoft Corporation Ltd and the licensee.
+ */
package brooklyn.util.text;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..b51d784 100644
--- a/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..e6d591c 100644
--- a/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
@@ -1,21 +1,8 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * Copyright (c) 2009-2011 Cloudsoft Corporation Ltd. All rights reserved.
+ * Supplied under license http://www.cloudsoftcorp.com/license/montereyDeveloperEdition
+ * or such subsequent license agreed between Cloudsoft Corporation Ltd and the licensee.
+ */
package brooklyn.util.text;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..6501f73 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..4a70687 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..f5ce260 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import org.testng.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..bdbc30e 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringsTest.java
@@ -1,21 +1,6 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * Copyright (c) 2009-2013 Cloudsoft Corporation Ltd.
+ */
package brooklyn.util.text;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..fcd69b2 100644
--- a/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.text;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..803e566 100644
--- a/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.time;
import static org.testng.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..221cc54 100644
--- a/utils/common/src/test/java/brooklyn/util/time/DurationTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/DurationTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.time;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..5fb68a0 100644
--- a/utils/common/src/test/java/brooklyn/util/time/TimeTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/TimeTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.time;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 3a2b82b..b636474 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -1,23 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..6ee293e 100644
--- a/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util;
import static brooklyn.util.GroovyJavaMethods.truth
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..75c19dd 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.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/b03200db/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..bfb1b2c 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal
import java.lang.reflect.Field
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..3bfce9e 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal
import groovy.time.TimeDuration
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/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..53cf24d 100644
--- a/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
+++ b/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal;
import static org.testng.Assert.*
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/groovy/src/test/java/brooklyn/util/internal/PojoTestingFields.java
----------------------------------------------------------------------
diff --git a/utils/groovy/src/test/java/brooklyn/util/internal/PojoTestingFields.java b/utils/groovy/src/test/java/brooklyn/util/internal/PojoTestingFields.java
index fc8f997..1c03274 100644
--- a/utils/groovy/src/test/java/brooklyn/util/internal/PojoTestingFields.java
+++ b/utils/groovy/src/test/java/brooklyn/util/internal/PojoTestingFields.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal;
public class PojoTestingFields {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/groovy/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
----------------------------------------------------------------------
diff --git a/utils/groovy/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy b/utils/groovy/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
index 1330abb..be2ebce 100644
--- a/utils/groovy/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
+++ b/utils/groovy/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.internal;
import static java.util.concurrent.TimeUnit.*
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index e7ae54d..1ff503e 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -1,23 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java b/utils/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java
index 3d1c878..e386a09 100644
--- a/utils/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java
+++ b/utils/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.jmx.jmxmp;
import java.io.FileInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java
index 43c66a4..6f06057 100644
--- a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java
+++ b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.jmx.jmxmp;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java
index 5993a9e..3cfe912 100644
--- a/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java
+++ b/utils/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpClient.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.jmx.jmxmp;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxrmi-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml
index ad144db..390c9d1 100644
--- a/utils/jmx/jmxrmi-agent/pom.xml
+++ b/utils/jmx/jmxrmi-agent/pom.xml
@@ -1,23 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxrmi-agent/src/main/java/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxrmi-agent/src/main/java/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java b/utils/jmx/jmxrmi-agent/src/main/java/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java
index 0a4e7c0..00da016 100644
--- a/utils/jmx/jmxrmi-agent/src/main/java/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java
+++ b/utils/jmx/jmxrmi-agent/src/main/java/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java
@@ -1,21 +1,7 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
+ * Copyright 2013 by Cloudsoft Corp.
+ * Copyright 2007 by Sun Microsystems, Inc.
+ */
package brooklyn.util.jmx.jmxrmi;
import java.lang.management.ManagementFactory;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/jmx/jmxrmi-agent/src/test/java/brooklyn/util/jmx/jmxrmi/JmxRmiClient.java
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxrmi-agent/src/test/java/brooklyn/util/jmx/jmxrmi/JmxRmiClient.java b/utils/jmx/jmxrmi-agent/src/test/java/brooklyn/util/jmx/jmxrmi/JmxRmiClient.java
index a5213c4..5236697 100644
--- a/utils/jmx/jmxrmi-agent/src/test/java/brooklyn/util/jmx/jmxrmi/JmxRmiClient.java
+++ b/utils/jmx/jmxrmi-agent/src/test/java/brooklyn/util/jmx/jmxrmi/JmxRmiClient.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.util.jmx.jmxrmi;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index cdfc30b..88c3335 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -1,23 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/Apidoc.java
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/Apidoc.java b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/Apidoc.java
index fc42663..07c9d71 100644
--- a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/Apidoc.java
+++ b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/Apidoc.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.rest.apidoc;
import java.lang.annotation.ElementType;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java
index 986736f..c454180 100644
--- a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java
+++ b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.rest.apidoc;
import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
index 5f48b8a..95231d2 100644
--- a/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
+++ b/utils/rest-swagger/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
package brooklyn.rest.apidoc;
import javax.ws.rs.ext.Provider;