Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 32A7210180 for ; Wed, 9 Jul 2014 13:34:36 +0000 (UTC) Received: (qmail 55783 invoked by uid 500); 9 Jul 2014 13:34:35 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 55762 invoked by uid 500); 9 Jul 2014 13:34:35 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 55753 invoked by uid 99); 9 Jul 2014 13:34:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 13:34:35 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 09 Jul 2014 13:32:52 +0000 Received: (qmail 48059 invoked by uid 99); 9 Jul 2014 13:32:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 13:32:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 10EAA9A9694; Wed, 9 Jul 2014 13:32:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 09 Jul 2014 13:32:27 -0000 Message-Id: <21672e1605a74c6996d59f03e288b4a8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/43] Revert "Merge and close PR #43" X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/PolicyResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/PolicyResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/PolicyResourceTest.java index d151d1c..c94eae2 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/PolicyResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/PolicyResourceTest.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.resources; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java index 3313366..0a5ebad 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.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.resources; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/SensorResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/SensorResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/SensorResourceTest.java index a7aaf15..c57bf69 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/SensorResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/SensorResourceTest.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.resources; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/ServerResourceTest.java index 8349adf..50ea218 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/ServerResourceTest.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.resources; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java index 1d614f9..b15f191 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.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.resources; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/resources/VersionResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/VersionResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/VersionResourceTest.java index f8bc25d..7abb92e 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/VersionResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/VersionResourceTest.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.resources; import brooklyn.rest.testing.BrooklynRestResourceTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestApiTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestApiTest.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestApiTest.java index 483eecd..2032f58 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestApiTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestApiTest.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.testing; import io.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestResourceTest.java index 0325ddb..55e4e85 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/BrooklynRestResourceTest.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.testing; import static org.testng.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java index 61e876d..0656c88 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java @@ -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.testing.mocks; import brooklyn.entity.basic.EntityLocal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java index 49ee6a1..c673a8d 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java @@ -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.testing.mocks; import brooklyn.entity.Group; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java index 46e24fa..867682d 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java @@ -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.testing.mocks; import brooklyn.entity.basic.DynamicGroupImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java index a88abe3..0370d03 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java @@ -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.testing.mocks; import brooklyn.entity.basic.AbstractApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java index c2b4431..6360ec2 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java @@ -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.testing.mocks; import brooklyn.entity.Entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index 2d9eedd..0a0d63d 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -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.testing.mocks; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java index 2ced196..e105174 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java @@ -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.testing.mocks; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java index 87eeb9a..c2959e6 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java @@ -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.util; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java b/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java index d1700a1..190d41b 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java @@ -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.util; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java b/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java index 6ab1fbc..63e65d9 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java @@ -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.util; import java.lang.reflect.Type; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java b/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java index fb4e9c8..8a72937 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java @@ -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.util; import java.lang.reflect.Type; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/scripts/buildAndTest ---------------------------------------------------------------------- diff --git a/usage/scripts/buildAndTest b/usage/scripts/buildAndTest index 45c1a26..82ebc13 100755 --- a/usage/scripts/buildAndTest +++ b/usage/scripts/buildAndTest @@ -1,22 +1,5 @@ #!/bin/bash # -# 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. -# # Convenience script to clean, build, install and run unit and/or integration tests. # Recommend you run this prior to pushing to Github to reduce the chances of breaking # the continuous integration (unit tests) or overnight builds (integration tests.) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/scripts/change-version.sh ---------------------------------------------------------------------- diff --git a/usage/scripts/change-version.sh b/usage/scripts/change-version.sh index e2fc12b..d4af54b 100755 --- a/usage/scripts/change-version.sh +++ b/usage/scripts/change-version.sh @@ -1,22 +1,4 @@ #!/bin/bash -# -# 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. -# # changes the BROOKLYN version everywhere http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/scripts/grep-in-poms.sh ---------------------------------------------------------------------- diff --git a/usage/scripts/grep-in-poms.sh b/usage/scripts/grep-in-poms.sh index c3a7f79..ecab93b 100755 --- a/usage/scripts/grep-in-poms.sh +++ b/usage/scripts/grep-in-poms.sh @@ -1,22 +1,4 @@ #!/bin/bash -# -# 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. -# # usage: run in the root dir of a project, it will grep in poms up to 3 levels deep # e.g. where are shaded jars defined? http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/scripts/release-branch-from-master ---------------------------------------------------------------------- diff --git a/usage/scripts/release-branch-from-master b/usage/scripts/release-branch-from-master index 8d7befa..085bfa4 100755 --- a/usage/scripts/release-branch-from-master +++ b/usage/scripts/release-branch-from-master @@ -1,22 +1,4 @@ #!/bin/bash -e -# -# 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. -# usage(){ echo >&2 'Usage: release-branch-from-master --release [ --release-suffix ]' http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/scripts/release-make ---------------------------------------------------------------------- diff --git a/usage/scripts/release-make b/usage/scripts/release-make index df46ea1..a3cc54b 100755 --- a/usage/scripts/release-make +++ b/usage/scripts/release-make @@ -1,22 +1,4 @@ #!/bin/bash -e -u -# -# 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. -# usage(){ echo >&2 'Usage: release-make [ --release ] [ --next ]' http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index b022696..912b1f5 100644 --- a/usage/test-support/pom.xml +++ b/usage/test-support/pom.xml @@ -1,23 +1,3 @@ - - - http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java index e2dc102..bf0f0d7 100644 --- a/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java +++ b/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.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 static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java index c5179ec..e52dbc9 100644 --- a/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java +++ b/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.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 static com.google.common.base.Predicates.instanceOf; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy b/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy index 8c1f85c..f151214 100644 --- a/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy +++ b/usage/test-support/src/main/java/brooklyn/test/TestUtils.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.test import static org.testng.Assert.* http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java b/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java index ec6d0e3..aa360a5 100644 --- a/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java +++ b/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.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.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java b/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java index 2ee8d7d..42295c9 100644 --- a/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java +++ b/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.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.atomic.AtomicBoolean; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index 6a996cb..607f3b7 100644 --- a/utils/common/pom.xml +++ b/utils/common/pom.xml @@ -1,23 +1,3 @@ - - - 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/config/ConfigKey.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/ConfigKey.java b/utils/common/src/main/java/brooklyn/config/ConfigKey.java index 24bcae1..a23ebe3 100644 --- a/utils/common/src/main/java/brooklyn/config/ConfigKey.java +++ b/utils/common/src/main/java/brooklyn/config/ConfigKey.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.config; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/config/ConfigMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/ConfigMap.java b/utils/common/src/main/java/brooklyn/config/ConfigMap.java index ed7fe3b..557f36c 100644 --- a/utils/common/src/main/java/brooklyn/config/ConfigMap.java +++ b/utils/common/src/main/java/brooklyn/config/ConfigMap.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.config; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/config/StringConfigMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java b/utils/common/src/main/java/brooklyn/config/StringConfigMap.java index 44911b1..b81d664 100644 --- a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java +++ b/utils/common/src/main/java/brooklyn/config/StringConfigMap.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.config; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/test/Asserts.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/test/Asserts.java b/utils/common/src/main/java/brooklyn/test/Asserts.java index b56b627..30bbe06 100644 --- a/utils/common/src/main/java/brooklyn/test/Asserts.java +++ b/utils/common/src/main/java/brooklyn/test/Asserts.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 groovy.lang.Closure; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java b/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java index a49f028..2839bb9 100644 --- a/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java +++ b/utils/common/src/main/java/brooklyn/util/CommandLineUtil.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; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java b/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java index 7adbb01..e46a09f 100644 --- a/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java +++ b/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.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; import groovy.lang.Closure; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/ShellUtils.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/ShellUtils.java b/utils/common/src/main/java/brooklyn/util/ShellUtils.java index be95fe1..0016dff 100644 --- a/utils/common/src/main/java/brooklyn/util/ShellUtils.java +++ b/utils/common/src/main/java/brooklyn/util/ShellUtils.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; import groovy.io.GroovyPrintStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java b/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java index f86faaf..3fa3d98 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java +++ b/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.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/main/java/brooklyn/util/collections/Jsonya.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java index f4e289f..ef39165 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java +++ b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.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/main/java/brooklyn/util/collections/MutableList.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableList.java b/utils/common/src/main/java/brooklyn/util/collections/MutableList.java index f6cf755..8cffc53 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/MutableList.java +++ b/utils/common/src/main/java/brooklyn/util/collections/MutableList.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/main/java/brooklyn/util/collections/MutableMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java b/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java index d4fb944..76a2967 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java +++ b/utils/common/src/main/java/brooklyn/util/collections/MutableMap.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.Iterator; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java index 3c35449..f791949 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java +++ b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.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.Collection; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java b/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java index e55d525..5f1942d 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java +++ b/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.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.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java b/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java index f32d1b4..22ea07f 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java +++ b/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.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.LinkedList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java b/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java index ad09e15..249e070 100644 --- a/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java +++ b/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.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 com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java b/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java index 8a71e2f..89790df 100644 --- a/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java +++ b/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.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.crypto; import java.net.URLConnection; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java b/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java index a16fd39..f34cb91 100644 --- a/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java +++ b/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.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.crypto; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java index 3db4b5a..0072fb6 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.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.exceptions; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java index 2a8a02e..42fddb2 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.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.exceptions; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java index 74e7ced..f858b5e 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.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.exceptions; /** As {@link FatalRuntimeException} super, specialized for configuration errors. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java index 833edcb..70063fc 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.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.exceptions; /** Exception indicating a fatal error, typically used in CLI routines. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java index 6d53606..9324100 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.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.exceptions; /** Indicates a runtime exception which has been propagated via {@link Exceptions#propagate} */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java b/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java index 180f985..2083131 100644 --- a/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java +++ b/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.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.exceptions; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java b/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java index 71c7ff3..ef3a2c3 100644 --- a/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java +++ b/utils/common/src/main/java/brooklyn/util/git/GithubUrls.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.git; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/Functionals.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/Functionals.java b/utils/common/src/main/java/brooklyn/util/guava/Functionals.java index cccaf0c..d026710 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/Functionals.java +++ b/utils/common/src/main/java/brooklyn/util/guava/Functionals.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 com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java b/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java index 8bb5d44..9babda5 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java +++ b/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.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 java.util.concurrent.Callable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/Maybe.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/Maybe.java b/utils/common/src/main/java/brooklyn/util/guava/Maybe.java index 0989b18..85f7233 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/Maybe.java +++ b/utils/common/src/main/java/brooklyn/util/guava/Maybe.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 java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java b/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java index e91268d..8836e73 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java +++ b/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.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 com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java b/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java index df00ea7..067b985 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java +++ b/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.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 java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java b/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java index 3fc5cb1..26105f4 100644 --- a/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java +++ b/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.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 javax.annotation.Nullable;