BROOKLYN-162 - rename more references towards brooklyn.entity.basic package
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/58d6c5d0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/58d6c5d0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/58d6c5d0 Branch: refs/heads/0.8.0-incubating Commit: 58d6c5d068c1165fdd16019da4e9227ff7e9b74c Parents: 4a0c24f Author: Ciprian Ciubotariu <[email protected]> Authored: Wed Aug 19 14:03:58 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Wed Aug 19 14:11:14 2015 +0300 ---------------------------------------------------------------------- docs/_extra/big_examples/global-web-fabric/index.md | 6 +++--- docs/guide/ops/locations/index.md | 2 +- docs/guide/yaml/clusters.md | 2 +- docs/guide/yaml/example_yaml/cluster-vm.yaml | 2 +- docs/guide/yaml/example_yaml/simple-vm.yaml | 2 +- .../example_yaml/test-app-with-enrichers-slightly-simpler.yaml | 4 ++-- docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml | 2 +- .../guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml | 2 +- docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml | 4 ++-- docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml | 2 +- docs/guide/yaml/winrm/index.md | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/_extra/big_examples/global-web-fabric/index.md ---------------------------------------------------------------------- diff --git a/docs/_extra/big_examples/global-web-fabric/index.md b/docs/_extra/big_examples/global-web-fabric/index.md index d163611..6897ffe 100644 --- a/docs/_extra/big_examples/global-web-fabric/index.md +++ b/docs/_extra/big_examples/global-web-fabric/index.md @@ -100,7 +100,7 @@ This will extend the Brooklyn `AbstractApplication`: package brooklyn.demo; import static com.google.common.base.Preconditions.checkNotNull; -import brooklyn.entity.basic.AbstractApplication; +import org.apache.brooklyn.entity.core.AbstractApplication; public class GlobalWebFabricExample extends AbstractApplication { @Override @@ -203,8 +203,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.StringConfigMap; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.Attributes; +import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.entity.core.Attributes; import brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import brooklyn.entity.group.DynamicFabric; import brooklyn.entity.proxy.AbstractController; http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/ops/locations/index.md ---------------------------------------------------------------------- diff --git a/docs/guide/ops/locations/index.md b/docs/guide/ops/locations/index.md index c9b41db..367b774 100644 --- a/docs/guide/ops/locations/index.md +++ b/docs/guide/ops/locations/index.md @@ -231,7 +231,7 @@ For example, here is a complete blueprint that sets some AWS EC2 specific option location: AWS_eu-west-1 services: - - type: brooklyn.entity.basic.EmptySoftwareProcess + - type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess provisioningProperties: templateOptions: subnetId: subnet-041c8373 http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/clusters.md ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/clusters.md b/docs/guide/yaml/clusters.md index 854254e..78b1df9 100644 --- a/docs/guide/yaml/clusters.md +++ b/docs/guide/yaml/clusters.md @@ -7,7 +7,7 @@ categories: [use, guide, defining-applications] What if you want multiple machines? -One way is just to repeat the `- type: brooklyn.entity.basic.EmptySoftwareProcess` block, +One way is just to repeat the `- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess` block, but there's another way which will keep your powder [DRY](http://en.wikipedia.org/wiki/Don't_repeat_yourself): {% highlight yaml %} http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/cluster-vm.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/cluster-vm.yaml b/docs/guide/yaml/example_yaml/cluster-vm.yaml index a0a50da..50521fb 100644 --- a/docs/guide/yaml/example_yaml/cluster-vm.yaml +++ b/docs/guide/yaml/example_yaml/cluster-vm.yaml @@ -4,7 +4,7 @@ services: initialSize: 5 memberSpec: $brooklyn:entitySpec: - type: brooklyn.entity.basic.EmptySoftwareProcess + type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: VM provisioning.properties: minRam: 8g http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/simple-vm.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/simple-vm.yaml b/docs/guide/yaml/example_yaml/simple-vm.yaml index 149a1b9..8f6447c 100644 --- a/docs/guide/yaml/example_yaml/simple-vm.yaml +++ b/docs/guide/yaml/example_yaml/simple-vm.yaml @@ -1,6 +1,6 @@ name: simple-vm services: -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: VM provisioning.properties: minRam: 8192mb http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml index a6a8116..3c9b4ad 100644 --- a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml +++ b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml @@ -26,7 +26,7 @@ services: # instead of (or in addition to) this map brooklyn.config: sensorMapping: - $brooklyn:sensor("url"): $brooklyn:sensor("brooklyn.entity.basic.Attributes", "main.uri") + $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri") brooklyn.enrichers: - type: brooklyn.enricher.basic.Aggregator # aggregate `url` sensors from children into a list @@ -46,7 +46,7 @@ services: # pick one uri as the main one to use brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("urls.list") - enricher.targetSensor: $brooklyn:sensor("brooklyn.entity.basic.Attributes", "main.uri") + enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri") quote: false maximum: 1 brooklyn.enrichers: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml index 7950b8c..d768739 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml @@ -1,6 +1,6 @@ name: Simple Netcat Example From File location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Netcat Server download.url: file:///tmp/netcat-server.tgz http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml index 6752980..adaa933 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml @@ -1,7 +1,7 @@ name: Simple Netcat Example with Restarter Policy location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess id: netcat-server name: Simple Netcat Server launch.command: | http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml index 4893968..747d5a5 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml @@ -5,7 +5,7 @@ location: localhost services: # the netcat server instance, running in listener mode (-l) -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess id: netcat-server name: Simple Netcat Server launch.command: | @@ -40,7 +40,7 @@ services: command: cat server-input # a client to hit netcat -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Pinger # set the hostname of the netcat instance as an env var for the scripts http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml index d4cb37b..3023038 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml @@ -1,7 +1,7 @@ name: Simple Netcat Server Example location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Netcat Server launch.command: | echo hello | nc -l 4321 & http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/58d6c5d0/docs/guide/yaml/winrm/index.md ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/winrm/index.md b/docs/guide/yaml/winrm/index.md index 363fe08..7989a61 100644 --- a/docs/guide/yaml/winrm/index.md +++ b/docs/guide/yaml/winrm/index.md @@ -68,7 +68,7 @@ Alternatively, in your YAML blueprint: A Sample Blueprint ------------------ -Creating a Windows VM is done using the `brooklyn.entity.basic.VanillaWindowsProcess` entity type. This is very similar +Creating a Windows VM is done using the `org.apache.brooklyn.entity.software.base.VanillaWindowsProcess` entity type. This is very similar to `VanillaSoftwareProcess`, but adapted to work for Windows and WinRM instead of Linux. We suggest you read the [documentation for VanillaSoftwareProcess](../custom-entities.html#vanilla-software-using-bash) to find out what you can do with this entity. @@ -88,7 +88,7 @@ For example - here is a blueprint: templateOptions: {mapNewVolumeToDeviceName: ["/dev/sda1", 100, true]} services: - - type: brooklyn.entity.basic.VanillaWindowsProcess + - type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess brooklyn.config: templates.install: file:///Users/richard/install7zip.ps1: "C:\\install7zip.ps1"
