You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/07/09 16:06:32 UTC
[22/75] Revert "Revert "Merge and close PR #43""
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
index 073b983..6a28116 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.hamcrest.MatcherAssert.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
index 4b25198..46dcafb 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
index 848082b..0cff1d2 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
@@ -1,3 +1,21 @@
+/*
+ * 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.entity.Entity;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
index feb50df..cf295c3 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
index a8d8e60..876a008 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.hamcrest.MatcherAssert.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
index 68dee63..753f963 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.hamcrest.MatcherAssert.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
index f8b6796..83e0116 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
index 0d3c8fe..3dc6c48 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 brooklyn.rest.commands.catalog.ListCatalogEntitiesCommand;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
index 199af18..4844318 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.hamcrest.MatcherAssert.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
index 219f962..643bbaa 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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 static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml b/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
index 3f1ea52..0b529b3 100644
--- a/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
+++ b/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
@@ -1,3 +1,22 @@
+#
+# 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/cc89cd11/sandbox/dropwizard/src/test/resources/config/test-config.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/resources/config/test-config.yml b/sandbox/dropwizard/src/test/resources/config/test-config.yml
index 5064f20..dc965e6 100644
--- a/sandbox/dropwizard/src/test/resources/config/test-config.yml
+++ b/sandbox/dropwizard/src/test/resources/config/test-config.yml
@@ -1,3 +1,22 @@
+#
+# 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/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
index 1b2f89d..ecbb2b1 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.todo;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
index eae9672..8d2ea68 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.todo
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
index 20c32bc..d76a0f0 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.todo;
import java.util.Collection
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
index bcb0588..caa0202 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.todo
import java.util.List
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
index 6317803..baa68a4 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.todo
import java.util.List
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
index 648e6cb..183e8ed 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
@@ -1,3 +1,22 @@
+/*
+ * 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.demo
import java.util.List
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
index 6892928..3ce38fc 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.tomcat.todo
import brooklyn.config.BrooklynProperties;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
index 336647c..405303d 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.tomcat.todo
import brooklyn.entity.basic.AbstractApplication
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
index b4014ce..7a46218 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.tomcat.todo
import brooklyn.config.BrooklynProperties
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
index 8f822e2..92b75dd 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.demo.tomcat.todo;
import brooklyn.config.BrooklynProperties;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
index faad05d..f79f990 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.earlythoughts
import brooklyn.entity.basic.AbstractApplication
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
index 07fcce2..ca6e107 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.earlythoughts
import brooklyn.entity.basic.AbstractApplication
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
index f78ff0d..10d8fbe 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.earlythoughts;
import java.util.Map
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/resources/gemfire/server-conf.xml
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/resources/gemfire/server-conf.xml b/sandbox/examples/src/main/resources/gemfire/server-conf.xml
index 0bbaf1d..78859e9 100644
--- a/sandbox/examples/src/main/resources/gemfire/server-conf.xml
+++ b/sandbox/examples/src/main/resources/gemfire/server-conf.xml
@@ -1,4 +1,23 @@
-<?xml version="1.0"?>
+<?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.
+-->
+
<!DOCTYPE cache PUBLIC
"-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
"http://www.gemstone.com/dtd/cache6_5.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/scripts/create-all-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/create-all-instances.sh b/sandbox/examples/src/main/scripts/create-all-instances.sh
index c9ec23e..946ca3f 100755
--- a/sandbox/examples/src/main/scripts/create-all-instances.sh
+++ b/sandbox/examples/src/main/scripts/create-all-instances.sh
@@ -1,4 +1,22 @@
-#!/bin/bash -x
+#!/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.
+#
# Creates an instance in each of the given regions.
# Must supply the directory with the ssh-key that aws generated for that region,
# and optionally supply a public key to be added to ~/.ssh/authorized_keys on the created instance
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/scripts/create-instance.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/create-instance.sh b/sandbox/examples/src/main/scripts/create-instance.sh
index 5100e4f..3ea6904 100755
--- a/sandbox/examples/src/main/scripts/create-instance.sh
+++ b/sandbox/examples/src/main/scripts/create-instance.sh
@@ -1,4 +1,22 @@
#!/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.
+#
# Creates an instance in each of the given region.
# Must supply the ami to use,
# the region,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/scripts/run-at-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/run-at-instances.sh b/sandbox/examples/src/main/scripts/run-at-instances.sh
index 24311ee..a6fffbf 100755
--- a/sandbox/examples/src/main/scripts/run-at-instances.sh
+++ b/sandbox/examples/src/main/scripts/run-at-instances.sh
@@ -1,4 +1,22 @@
#!/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.
+#
if [ -z "$1" ]; then
echo "command not found"
@@ -26,4 +44,4 @@ for instance in $INSTANCES ; do
ssh -f root@$instance "$CMD" | awk '{print "OUTPUT '$instance': " $0}' &
done
-wait
\ No newline at end of file
+wait
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/examples/src/main/scripts/stop-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/stop-instances.sh b/sandbox/examples/src/main/scripts/stop-instances.sh
index df171fc..a58eb72 100755
--- a/sandbox/examples/src/main/scripts/stop-instances.sh
+++ b/sandbox/examples/src/main/scripts/stop-instances.sh
@@ -1,4 +1,22 @@
#!/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.
+#
INSTANCES=`cat instances.txt | cut -d " " -f 2`
@@ -19,4 +37,4 @@ for instance in $INSTANCES ; do
sed -i.bk /${instance}/D instances.txt
done
-wait
\ No newline at end of file
+wait
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/extra/pom.xml b/sandbox/extra/pom.xml
index 71c6795..01e18c9 100644
--- a/sandbox/extra/pom.xml
+++ b/sandbox/extra/pom.xml
@@ -1,3 +1,23 @@
+<?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/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
index fee456b..994cc8d 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
@@ -1,3 +1,21 @@
+/*
+ * 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.postgresql;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
index d9dd03d..c97ac44 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import static brooklyn.util.ssh.BashCommands.downloadToStdout;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
index 10a07b8..d1cf0e9 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import brooklyn.config.ConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
index aa9cb68..cad0ecd 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
index a08de67..03597c5 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
index 77f3d27..ecb2408 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
index 1570d65..b543333 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import brooklyn.entity.basic.SoftwareProcessDriver;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
index 0a25263..4cc5ba8 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
index e9103f7..1a2aa09 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
index 2be4037..7af43da 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import static brooklyn.util.ssh.BashCommands.INSTALL_CURL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/master b/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
index 0f5ccc3..72d7eb9 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
@@ -1,20 +1,21 @@
[#ftl]
-##
-# Copyright 2013 by Cloudsoft Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# 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
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# SaltStack Master Configuration
+# 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.
#
# /etc/salt/master
##
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless b/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
index 5477bc8..ba41c6e 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
@@ -1,18 +1,22 @@
[#ftl]
##
-# Copyright 2013 by Cloudsoft Corp.
#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# 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
+# http://www.apache.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.
+# 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.
#
# SaltStack Masterless Minion Configuration
#
@@ -46,4 +50,4 @@ file_roots:
output: nested
color: False
log_level: info
-log_level_logfile: debug # Debugging
\ No newline at end of file
+log_level_logfile: debug # Debugging
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion b/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
index 34f6caf..cff42c7 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
@@ -1,18 +1,21 @@
[#ftl]
##
-# Copyright 2013 by Cloudsoft Corp.
+# 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
#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "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.
+# 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.
#
# SaltStack Minion Configuration
#
@@ -46,4 +49,4 @@ key_logfile: ${runDir}/key.log
output: nested
color: False
log_level: info
-log_level_logfile: debug # Debugging
\ No newline at end of file
+log_level_logfile: debug # Debugging
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
index c810ee0..81cb676 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.postgresql;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
index 198c855..1bf89f1 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
index 6728ed6..25bdad9 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
@@ -1,18 +1,21 @@
/*
- * Copyright 2013 by Cloudsoft Corp.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
+ * 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.salt;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/pom.xml b/sandbox/monitoring/pom.xml
index 9ac8762..092ae35 100644
--- a/sandbox/monitoring/pom.xml
+++ b/sandbox/monitoring/pom.xml
@@ -1,3 +1,23 @@
+<?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/cc89cd11/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
index 837281b..fd0c170 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
@@ -1,3 +1,21 @@
+/*
+ * 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.monitoring.zabbix;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
index b6264b0..187ff6d 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
@@ -1,3 +1,21 @@
+/*
+ * 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.monitoring.zabbix;
import brooklyn.config.ConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
index 40ef383..1e89727 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
@@ -1,3 +1,21 @@
+/*
+ * 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.monitoring.zabbix;
import javax.annotation.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
index 0c267c0..4813ad1 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
@@ -1,3 +1,21 @@
+/*
+ * 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.monitoring.zabbix;
import brooklyn.config.ConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
index 6a9c73d..3ed4bc1 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
@@ -1,3 +1,21 @@
+/*
+ * 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.monitoring.zabbix;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cc89cd11/sandbox/nosql/README.md
----------------------------------------------------------------------
diff --git a/sandbox/nosql/README.md b/sandbox/nosql/README.md
index 4ca3197..034d49a 100644
--- a/sandbox/nosql/README.md
+++ b/sandbox/nosql/README.md
@@ -72,3 +72,21 @@ multiple nodes (subject to the data being written being fairly evenly
distributed across nodes).
See http://docs.mongodb.org/manual/sharding/
+
+----
+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.
\ No newline at end of file