Repository: incubator-brooklyn Updated Branches: refs/heads/master 6665cc66b -> ca89ed4f5
Added ASF Licence Header * Fix for test-framework using incorrect parent pom 'brooklyn' -> 'brooklyn-parent' Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d0f3b820 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d0f3b820 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d0f3b820 Branch: refs/heads/master Commit: d0f3b82063765c62bf172ff5f0a08b04bb2ff4ea Parents: 9460544 Author: Mark McKenna <[email protected]> Authored: Fri Nov 13 01:09:22 2015 +0000 Committer: Mark McKenna <[email protected]> Committed: Fri Nov 13 02:00:56 2015 +0000 ---------------------------------------------------------------------- usage/test-framework/README.md | 20 +++++++++++++++ usage/test-framework/pom.xml | 27 +++++++++++++++++--- .../brooklyn/test/framework/AbstractTest.java | 19 +++++++++++++- .../brooklyn/test/framework/BaseTest.java | 18 +++++++++++++ .../test/framework/ParallelTestCase.java | 18 +++++++++++++ .../test/framework/ParallelTestCaseImpl.java | 18 +++++++++++++ .../brooklyn/test/framework/TestCase.java | 18 +++++++++++++ .../brooklyn/test/framework/TestCaseImpl.java | 18 +++++++++++++ .../brooklyn/test/framework/TestEffector.java | 20 +++++++++++++-- .../test/framework/TestEffectorImpl.java | 18 +++++++++++++ .../brooklyn/test/framework/TestHttpCall.java | 18 +++++++++++++ .../test/framework/TestHttpCallImpl.java | 18 +++++++++++++ .../brooklyn/test/framework/TestSensor.java | 23 +++++++++++++---- .../brooklyn/test/framework/TestSensorImpl.java | 19 +++++++++++++- .../test/framework/TestEffectorTest.java | 19 ++++++++++++++ .../brooklyn/test/framework/TestSensorTest.java | 19 ++++++++++++++ .../test/framework/entity/TestEntity.java | 19 ++++++++++++++ .../test/framework/entity/TestEntityImpl.java | 19 ++++++++++++++ .../resources/test-framework-examples/README.md | 19 ++++++++++++++ .../example-catalog-test.bom | 18 +++++++++++++ .../test-framework-examples/example-catalog.bom | 18 +++++++++++++ .../nginx-test-examples.yml | 18 +++++++++++++ .../testhttpcall-examples.yml | 18 +++++++++++++ .../tomcat-test-examples.yml | 18 +++++++++++++ 24 files changed, 444 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/README.md ---------------------------------------------------------------------- diff --git a/usage/test-framework/README.md b/usage/test-framework/README.md index 65556d8..9c22e2b 100644 --- a/usage/test-framework/README.md +++ b/usage/test-framework/README.md @@ -107,3 +107,23 @@ Entity that makes a HTTP Request and tests the response assert: regex: "(?s).*illustrate(\\s)*how(\\s)*web(\\s)*applications.*" ``` + + + +---- +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 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-framework/pom.xml b/usage/test-framework/pom.xml index 0430787..006afdc 100644 --- a/usage/test-framework/pom.xml +++ b/usage/test-framework/pom.xml @@ -1,12 +1,31 @@ <?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";> <parent> - <artifactId>brooklyn</artifactId> + <artifactId>brooklyn-parent</artifactId> <groupId>org.apache.brooklyn</groupId> - <version>0.9.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -53,7 +72,7 @@ <scope>test</scope> </dependency> <!--TEST SCOPE :: END--> - + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTest.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTest.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTest.java index 2194286..d97d09b 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTest.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTest.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 org.apache.brooklyn.test.framework; import org.apache.brooklyn.api.entity.Entity; @@ -23,7 +41,6 @@ public abstract class AbstractTest extends AbstractEntity implements BaseTest { * lookup using DSL ($brooklyn:component("myNginX")), if id of entity provided as "targetId" config key. * * @return The target entity. - * * @throws @RuntimeException if no target can be determined. */ public Entity resolveTarget() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java index 19dcb63..7fd70ef 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.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 org.apache.brooklyn.test.framework; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java index 47de3b6..63fe60f 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.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 org.apache.brooklyn.test.framework; import org.apache.brooklyn.api.entity.Entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java index 2a00a63..3b06f23 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.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 org.apache.brooklyn.test.framework; import org.apache.brooklyn.api.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java index 6d2ae11..78fd8d6 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.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 org.apache.brooklyn.test.framework; import org.apache.brooklyn.api.entity.ImplementedBy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java index 1b443fb..71efca3 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.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 org.apache.brooklyn.test.framework; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java index f280137..14c45f5 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.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 org.apache.brooklyn.test.framework; import com.google.common.collect.ImmutableMap; @@ -7,10 +25,8 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import org.apache.brooklyn.util.time.Duration; import java.util.Map; -import java.util.concurrent.TimeUnit; /** * Entity that invokes an effector on another entity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java index f2c0f51..817ef6a 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.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 org.apache.brooklyn.test.framework; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java index b283af8..f1e51f6 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.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 org.apache.brooklyn.test.framework; import org.apache.brooklyn.api.entity.ImplementedBy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java index 9cf46dc..66e24da 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.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 org.apache.brooklyn.test.framework; import com.google.api.client.util.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java index e5b46a5..ec070d1 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java @@ -1,14 +1,27 @@ +/* + * 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 org.apache.brooklyn.test.framework; -import com.google.common.collect.Maps; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import org.apache.brooklyn.util.time.Duration; - -import java.util.Map; -import java.util.concurrent.TimeUnit; /** * Entity that tests a sensor value on another entity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java index 0e1cefc..c2d6169 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.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 org.apache.brooklyn.test.framework; import com.google.api.client.util.Objects; @@ -9,7 +27,6 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; -import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.core.flags.TypeCoercions; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java index c59ac03..ab01eea 100644 --- a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java +++ b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java @@ -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 org.apache.brooklyn.test.framework; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java index 2d033e6..ecb1c31 100644 --- a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java +++ b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java @@ -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 org.apache.brooklyn.test.framework; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java index a9a6fc0..a0abcf1 100644 --- a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java +++ b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java @@ -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 org.apache.brooklyn.test.framework.entity; import org.apache.brooklyn.api.entity.Entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java index 5c81a7b..50ef967 100644 --- a/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java +++ b/usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java @@ -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 org.apache.brooklyn.test.framework.entity; import org.apache.brooklyn.api.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/README.md ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/README.md b/usage/test-framework/src/test/resources/test-framework-examples/README.md index 87fbb1f..990753f 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/README.md +++ b/usage/test-framework/src/test/resources/test-framework-examples/README.md @@ -7,3 +7,22 @@ | [nginx-test-examples.yml](./nginx-test-examples.yml) | A number of test fragments for the NGiNX entity | | [tomcat-test-examples.yml](./tomcat-test-examples.yml) | A number of test fragments for the TomcatServer entity | | [testhttpcall-examples.yml](./testhttpcall-examples.yml) | A number of test fragments showing usage of TestHttp entity | + + +---- +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 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom b/usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom index 0605f9d..fae0f60 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom +++ b/usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom @@ -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. +# brooklyn.catalog: id: simple-tomcat-test version: 1.0 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom b/usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom index ab7e54b..c87fe3d 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom +++ b/usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom @@ -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. +# brooklyn.catalog: id: simple-tomcat version: 1.0 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml b/usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml index f1711ea..6cb7d2d 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml +++ b/usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml @@ -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. +# --- # 1. Start an nginx # 2. Test it is running http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml b/usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml index b439c8a..2b7a871 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml +++ b/usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml @@ -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. +# --- name: Basic HTTP Call Tests location: localhost http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f3b820/usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml b/usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml index 37d7f4d..a971355 100644 --- a/usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml +++ b/usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml @@ -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. +# --- name: Tomcat Multi-War Test location: localhost
