You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/12/23 12:07:20 UTC
[57/71] [abbrv] incubator-brooklyn git commit: [LIBRARY] move camp
webapp related tests from software-webapp to qa module adding them to
software-webapp had introduced a dependency on software-database
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b32a37b4/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml b/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml
deleted file mode 100644
index 526e90b..0000000
--- a/brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml
+++ /dev/null
@@ -1,28 +0,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
-#
-# 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: sample-single-jboss
-description: Single JBoss using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server
- name: tomcat1
- brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-webapp/0.7.0-M1/brooklyn-example-hello-world-webapp-0.7.0-M1.war
- http.port: 9280+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b32a37b4/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml b/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
deleted file mode 100644
index 2b55237..0000000
--- a/brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+++ /dev/null
@@ -1,74 +0,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
-#
-# 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.
-#
-# example showing how enrichers can be set
-#
-name: test-app-with-enrichers
-description: Testing many enrichers
-services:
-- type: org.apache.brooklyn.entity.group.DynamicCluster
- id: cluster
- initialSize: 3
- location: localhost
- memberSpec:
- $brooklyn:entitySpec:
- type: org.apache.brooklyn.core.test.entity.TestEntity
- brooklyn.enrichers:
- - type: org.apache.brooklyn.enricher.stock.Transformer
- # transform "ip" (which we expect a feed, not shown here, to set) to a URL;
- # you can curl an address string to the sensors/ip endpoint an entity to trigger these enrichers
- brooklyn.config:
- enricher.sourceSensor: $brooklyn:sensor("ip")
- enricher.targetSensor: $brooklyn:sensor("url")
- enricher.targetValue: $brooklyn:formatString("http://%s/", $brooklyn:attributeWhenReady("ip"))
- - type: org.apache.brooklyn.enricher.stock.Propagator
- # use propagator to duplicate one sensor as another, giving the supplied sensor mapping;
- # the other use of Propagator is where you specify a producer (using $brooklyn:entity(...) as below)
- # from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged,
- # instead of (or in addition to) this map
- brooklyn.config:
- sensorMapping:
- $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
- brooklyn.enrichers:
- - type: org.apache.brooklyn.enricher.stock.Aggregator
- # aggregate `url` sensors from children into a list
- brooklyn.config:
- enricher.sourceSensor: $brooklyn:sensor("url")
- enricher.targetSensor: $brooklyn:sensor("urls.list")
- enricher.aggregating.fromMembers: true
- - type: org.apache.brooklyn.enricher.stock.Joiner
- # create a string from that list, for use e.g. in bash scripts
- brooklyn.config:
- enricher.sourceSensor: $brooklyn:sensor("urls.list")
- enricher.targetSensor: $brooklyn:sensor("urls.list.comma_separated.max_2")
- maximum: 2
- # TODO infer uniqueTag, name etc
- uniqueTag: urls.list.comma_separated.max_2
- - type: org.apache.brooklyn.enricher.stock.Joiner
- # pick one uri as the main one to use
- brooklyn.config:
- enricher.sourceSensor: $brooklyn:sensor("urls.list")
- enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
- quote: false
- maximum: 1
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Propagator
- # if nothing specified for `propagating` or `sensorMapping` then
- # Propagator will do all but the usual lifecycle defaults, handy at the root!
- brooklyn.config:
- producer: $brooklyn:entity("cluster")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b32a37b4/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml b/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml
deleted file mode 100644
index e3087b8..0000000
--- a/brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml
+++ /dev/null
@@ -1,30 +0,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
-#
-# 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: Test Tomcat cluster
-location: localhost
-services:
-- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: tomcat-cluster
- initialSize: 2
- memberSpec:
- $brooklyn:entitySpec:
- type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
- brooklyn.config:
- dynamiccluster.quarantineFailedEntities: false
- cluster.initial.quorumSize: 2
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b32a37b4/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml b/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml
deleted file mode 100644
index 9a508cb..0000000
--- a/brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml
+++ /dev/null
@@ -1,47 +0,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
-#
-# 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.
-#
-# example showing how enrichers can be set
-#
-name: test-webapp-with-averaging-enricher
-description: Testing many enrichers
-services:
-- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- initialSize: 3
- location: localhost
-
- # define the web cluster, adding an averaging enricher to the cluster.
- # this assumes the test fixture will set the "my.load" sensor on the member-specs in here.
- webClusterSpec:
- $brooklyn:entitySpec:
- type: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster
- id: cluster
- brooklyn.enrichers:
- - type: org.apache.brooklyn.enricher.stock.Aggregator
- brooklyn.config:
- enricher.sourceSensor: $brooklyn:sensor("my.load")
- enricher.targetSensor: $brooklyn:sensor("my.load.averaged")
- enricher.aggregating.fromMembers: true
- transformation: average
-
- brooklyn.enrichers:
- - type: org.apache.brooklyn.enricher.stock.Propagator
- brooklyn.config:
- producer: $brooklyn:entity("cluster")
- propagating:
- - $brooklyn:sensor("my.load.averaged")