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:46 UTC
[23/43] Revert "Merge and close PR #43"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java
index 6213644..63aed9e 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.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.policy.loadbalancing;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
index 01cfaaf..cf125a9 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.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.policy.loadbalancing;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java
index b08e8e1..44a2c0d 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.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.policy.loadbalancing;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
index bddba9b..8a09a32 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.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.policy.loadbalancing;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java
index 85c36e3..1ecec81 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.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.policy.loadbalancing;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
index bf620dd..9d3bce4 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.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.policy.loadbalancing;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c1eeb49..88c735a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,4 @@
<?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/sandbox/cassandra-multicloud-snitch/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/cassandra-multicloud-snitch/pom.xml b/sandbox/cassandra-multicloud-snitch/pom.xml
index 51b7f8b..3351a37 100644
--- a/sandbox/cassandra-multicloud-snitch/pom.xml
+++ b/sandbox/cassandra-multicloud-snitch/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>
<artifactId>brooklyn-sandbox-cassandra-multicloud-snitch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/cassandra-multicloud-snitch/src/main/java/brooklyn/entity/nosql/cassandra/customsnitch/MultiCloudSnitch.java
----------------------------------------------------------------------
diff --git a/sandbox/cassandra-multicloud-snitch/src/main/java/brooklyn/entity/nosql/cassandra/customsnitch/MultiCloudSnitch.java b/sandbox/cassandra-multicloud-snitch/src/main/java/brooklyn/entity/nosql/cassandra/customsnitch/MultiCloudSnitch.java
index d6651b8..2850a29 100644
--- a/sandbox/cassandra-multicloud-snitch/src/main/java/brooklyn/entity/nosql/cassandra/customsnitch/MultiCloudSnitch.java
+++ b/sandbox/cassandra-multicloud-snitch/src/main/java/brooklyn/entity/nosql/cassandra/customsnitch/MultiCloudSnitch.java
@@ -7,24 +7,6 @@
* "License"); you may not use this 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.
-*/
-/*
- * 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
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/database/pom.xml b/sandbox/database/pom.xml
index 312ddfe..24d4ae4 100644
--- a/sandbox/database/pom.xml
+++ b/sandbox/database/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/sandbox/database/src/main/java/brooklyn/entity/database/Database.groovy
----------------------------------------------------------------------
diff --git a/sandbox/database/src/main/java/brooklyn/entity/database/Database.groovy b/sandbox/database/src/main/java/brooklyn/entity/database/Database.groovy
index 449d65a..1454ca0 100644
--- a/sandbox/database/src/main/java/brooklyn/entity/database/Database.groovy
+++ b/sandbox/database/src/main/java/brooklyn/entity/database/Database.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.entity.database
import brooklyn.event.basic.BasicConfigKey
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.java
----------------------------------------------------------------------
diff --git a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.java b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.java
index 7210137..6bafb98 100644
--- a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.java
+++ b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.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.entity.database.derby;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseDriver.java b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseDriver.java
index 5468104..b5b7ba7 100644
--- a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseDriver.java
+++ b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseDriver.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.entity.database.derby;
import brooklyn.entity.java.JavaSoftwareProcessDriver;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java
index 9e244ab..c0726b8 100644
--- a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java
+++ b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.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.entity.database.derby;
import static java.lang.String.format;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbySchema.java
----------------------------------------------------------------------
diff --git a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbySchema.java
index a2046b4..b4795f3 100644
--- a/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbySchema.java
+++ b/sandbox/database/src/main/java/brooklyn/entity/database/derby/DerbySchema.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.entity.database.derby;
import static java.lang.String.format;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/database/src/test/java/brooklyn/entity/database/PlaceholderTest.java
----------------------------------------------------------------------
diff --git a/sandbox/database/src/test/java/brooklyn/entity/database/PlaceholderTest.java b/sandbox/database/src/test/java/brooklyn/entity/database/PlaceholderTest.java
index 47e5194..6b33ced 100644
--- a/sandbox/database/src/test/java/brooklyn/entity/database/PlaceholderTest.java
+++ b/sandbox/database/src/test/java/brooklyn/entity/database/PlaceholderTest.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.entity.database;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/README.txt
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/README.txt b/sandbox/dropwizard/README.txt
index 6991253..501f386 100644
--- a/sandbox/dropwizard/README.txt
+++ b/sandbox/dropwizard/README.txt
@@ -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.
-*/
What is Brooklyn?
-----------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/brooklyn
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/brooklyn b/sandbox/dropwizard/brooklyn
index 92bb4ea..348c36b 100755
--- a/sandbox/dropwizard/brooklyn
+++ b/sandbox/dropwizard/brooklyn
@@ -1,22 +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.
-#
-
#! /bin/bash
#
# Brooklyn cli client
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/brooklynd
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/brooklynd b/sandbox/dropwizard/brooklynd
index 9b14df2..d670936 100755
--- a/sandbox/dropwizard/brooklynd
+++ b/sandbox/dropwizard/brooklynd
@@ -1,21 +1,2 @@
#! /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.
-#
-
java -jar target/brooklyn-rest-SANDBOX-*-SNAPSHOT.jar $@
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/config.sample.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/config.sample.yml b/sandbox/dropwizard/config.sample.yml
index e7957cd..4da08e7 100644
--- a/sandbox/dropwizard/config.sample.yml
+++ b/sandbox/dropwizard/config.sample.yml
@@ -1,22 +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.
-#
-
# Config file for the Brooklyn REST endpoint
stopApplicationsOnExit: true
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/pom.xml b/sandbox/dropwizard/pom.xml
index fe25194..7e060f8 100644
--- a/sandbox/dropwizard/pom.xml
+++ b/sandbox/dropwizard/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">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh b/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
index fe8a2ec..14702c3 100755
--- a/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
+++ b/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
@@ -1,21 +1,2 @@
-#!/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.
-#
# this requires that the simple-web-example is included on the classpath
curl -u admin:admin -H Content-Type:application/json -d @AppByType_WebClusterDatabaseExample.json http://localhost:8090/v1/applications
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/samples/WebClusterWithMySQLDatabase.groovy
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/samples/WebClusterWithMySQLDatabase.groovy b/sandbox/dropwizard/samples/WebClusterWithMySQLDatabase.groovy
index 7abef78..18ba7fe 100644
--- a/sandbox/dropwizard/samples/WebClusterWithMySQLDatabase.groovy
+++ b/sandbox/dropwizard/samples/WebClusterWithMySQLDatabase.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.rest.entities.external
import static brooklyn.event.basic.DependentConfiguration.valueWhenAttributeReady
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/Client.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/Client.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/Client.java
index 7550a66..857543b 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/Client.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/Client.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.cli;
import brooklyn.cli.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/BrooklynCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/BrooklynCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/BrooklynCommand.java
index f0cea79..bcb1e1a 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/BrooklynCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/BrooklynCommand.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.cli.commands;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogEntitiesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogEntitiesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogEntitiesCommand.java
index 287741e..d5e4cd9 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogEntitiesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogEntitiesCommand.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.cli.commands;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogPoliciesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogPoliciesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogPoliciesCommand.java
index 01a3242..9ea5252 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogPoliciesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CatalogPoliciesCommand.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.cli.commands;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
index b85813e..1ee37b9 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.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.cli.commands;
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
index 9d45463..9a78e36 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.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.cli.commands;
import brooklyn.rest.domain.ApplicationSpec;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
index 5e394d2..39b9f8f 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.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.cli.commands;
import brooklyn.cli.Client;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
index 3f5d434..2c23d45 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.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.cli.commands;
import brooklyn.rest.domain.ApplicationSummary;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
index 74dfff6..7851191 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.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.cli.commands;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
index 7aefc44..8a25dd3 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.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.cli.commands;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
index 73ae208..7944bd5 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.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;
import brooklyn.management.ManagementContext;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
index a2ab4ef..d31e9cd 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.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;
import java.util.concurrent.CountDownLatch;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
index 62a84f2..8e812db 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.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;
public class ExecutorConfiguration {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
index 225395f..1f6ca32 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.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.auth;
import com.google.common.base.Optional;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
index 92c8fd2..0b457f3 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.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.auth;
import com.google.common.base.Optional;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
index fb116f3..fc845b4 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.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.auth;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
index dd9be2c..083a342 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.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.commands;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
index ad00454..7205ef2 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
@@ -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.commands.applications;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
index 02db9a6..6981368 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
@@ -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.commands.applications;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
index 8ace917..d94232f 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
@@ -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.commands.applications;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
index 7dec764..4785e14 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
@@ -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.commands.applications;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
index d5b7553..9393dd5 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
@@ -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.commands.applications;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
index 0862dff..c7d25b2 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
@@ -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.commands.applications;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
index 0f19798..f71fb81 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
@@ -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.commands.catalog;
import static com.google.common.base.Preconditions.checkArgument;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
index 72a0254..97bead4 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
@@ -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.commands.catalog;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
index bf4fb87..2ae9a05 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
@@ -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.commands.catalog;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
index 2f8deac..a335208 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
@@ -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.commands.catalog;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
index f64431b..776ef96 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
@@ -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.commands.locations;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
index 2463f0b..05d39ac 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
@@ -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.commands.locations;
import brooklyn.rest.commands.BrooklynCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
index 6d22040..cf1aa11 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.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.health;
import com.yammer.metrics.core.HealthCheck;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
index 332d220..33277c2 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.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.views;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
index 695b16c..f865e0d 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.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.views;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
index 6d04205..5da3ba8 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.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.views;
import com.google.common.base.Charsets;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java b/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
index 7378e01..eb7244b 100644
--- a/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
+++ b/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
@@ -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 com.yammer.dropwizard.logging;
import ch.qos.logback.classic.spi.ILoggingEvent;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl b/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
index 299bec9..badfb39 100644
--- a/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
+++ b/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
@@ -1,25 +1,5 @@
<#-- @ftlvariable name="" type="brooklyn.rest.views.SwaggerUiView" -->
<!DOCTYPE html>
-
-<!--
- 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.
--->
-
<html>
<head>
<meta charset='utf-8'/>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b03200db/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
index 8ada534..363f0e9 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.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.cli;
import org.testng.annotations.AfterSuite;