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 2016/02/06 11:40:39 UTC
[2/6] brooklyn-docs git commit: WAR url examples: use
0.8.0-incubating instead of 0.6.0
WAR url examples: use 0.8.0-incubating instead of 0.6.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2ea588de
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2ea588de
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2ea588de
Branch: refs/heads/master
Commit: 2ea588deb065f40e97082f1a176d43847a755f9c
Parents: 3dfa639
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 2 17:17:48 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:32:10 2016 +0000
----------------------------------------------------------------------
guide/java/defining-and-deploying.md | 2 +-
guide/ops/cli/cli-usage-guide.md | 2 +-
guide/ops/externalized-configuration.md | 2 +-
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/start/_my-web-cluster.yaml | 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml | 2 +-
guide/yaml/example_yaml/appserver-clustered-w-db.yaml | 2 +-
guide/yaml/example_yaml/appserver-configured-in-config.yaml | 2 +-
guide/yaml/example_yaml/appserver-configured.yaml | 2 +-
guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml | 2 +-
guide/yaml/example_yaml/appserver-w-db.yaml | 2 +-
guide/yaml/example_yaml/appserver-w-policy.yaml | 2 +-
guide/yaml/test/example_yaml/entities/testeffector-entity.yaml | 2 +-
.../yaml/test/example_yaml/testcases/effector-test-snippet.yaml | 2 +-
.../example_yaml/testcases/getting-started-test-example.yaml | 4 ++--
17 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/java/defining-and-deploying.md
----------------------------------------------------------------------
diff --git a/guide/java/defining-and-deploying.md b/guide/java/defining-and-deploying.md
index 8f56000..be1fa65 100644
--- a/guide/java/defining-and-deploying.md
+++ b/guide/java/defining-and-deploying.md
@@ -115,7 +115,7 @@ pointing at your favourite WAR on your filesystem.
(If the ``import`` packages aren't picked up correctly,
you can cheat by looking at [the file in Github](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExample.java);
and you'll find a sample WAR which uses the database as configured above
-[here](https://http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/).)
+[here](http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war).)
TODO example webapp url
If you want to adventure beyond ``localhost`` (the default),
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/cli/cli-usage-guide.md
----------------------------------------------------------------------
diff --git a/guide/ops/cli/cli-usage-guide.md b/guide/ops/cli/cli-usage-guide.md
index c8edf0d..593bb6b 100644
--- a/guide/ops/cli/cli-usage-guide.md
+++ b/guide/ops/cli/cli-usage-guide.md
@@ -458,7 +458,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
name: WebApp
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/externalized-configuration.md
----------------------------------------------------------------------
diff --git a/guide/ops/externalized-configuration.md b/guide/ops/externalized-configuration.md
index 24fd4eb..b0c85cd 100644
--- a/guide/ops/externalized-configuration.md
+++ b/guide/ops/externalized-configuration.md
@@ -27,7 +27,7 @@ services:
- type: brooklyn.entity.webapp.jboss.JBoss7Server
name: AppServer HelloWorld
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:postgresql://%s/myappdb?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/gui/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster.yaml b/guide/ops/gui/_my-web-cluster.yaml
index a3295b9..220dc09 100644
--- a/guide/ops/gui/_my-web-cluster.yaml
+++ b/guide/ops/gui/_my-web-cluster.yaml
@@ -10,7 +10,7 @@ services:
name: My Web
id: webappcluster
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/gui/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster2.yaml b/guide/ops/gui/_my-web-cluster2.yaml
index 33723ab..2e4310f 100644
--- a/guide/ops/gui/_my-web-cluster2.yaml
+++ b/guide/ops/gui/_my-web-cluster2.yaml
@@ -7,7 +7,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
name: My Web
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/start/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster.yaml b/guide/start/_my-web-cluster.yaml
index a3295b9..220dc09 100644
--- a/guide/start/_my-web-cluster.yaml
+++ b/guide/start/_my-web-cluster.yaml
@@ -10,7 +10,7 @@ services:
name: My Web
id: webappcluster
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/start/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster2.yaml b/guide/start/_my-web-cluster2.yaml
index 33723ab..2e4310f 100644
--- a/guide/start/_my-web-cluster2.yaml
+++ b/guide/start/_my-web-cluster2.yaml
@@ -7,7 +7,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
name: My Web
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml b/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
index 0fd8759..e60e35b 100644
--- a/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
+++ b/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
@@ -3,7 +3,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
initialSize: 2
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-clustered-w-db.yaml b/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
index 8bbb14f..fc24125 100644
--- a/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
@@ -6,7 +6,7 @@ services:
$brooklyn:entitySpec:
type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-configured-in-config.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-configured-in-config.yaml b/guide/yaml/example_yaml/appserver-configured-in-config.yaml
index f817dd7..765a8c2 100644
--- a/guide/yaml/example_yaml/appserver-configured-in-config.yaml
+++ b/guide/yaml/example_yaml/appserver-configured-in-config.yaml
@@ -2,5 +2,5 @@ name: appserver-configured-in-config
services:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-configured.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-configured.yaml b/guide/yaml/example_yaml/appserver-configured.yaml
index 58416ca..51bf3ca 100644
--- a/guide/yaml/example_yaml/appserver-configured.yaml
+++ b/guide/yaml/example_yaml/appserver-configured.yaml
@@ -1,5 +1,5 @@
name: appserver-configured
services:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- war: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ war: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
httpPort: 8080
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml b/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
index ac1106e..9556071 100644
--- a/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
@@ -3,7 +3,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
name: AppServer HelloWorld
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-w-db.yaml b/guide/yaml/example_yaml/appserver-w-db.yaml
index 0e9d959..53621e9 100644
--- a/guide/yaml/example_yaml/appserver-w-db.yaml
+++ b/guide/yaml/example_yaml/appserver-w-db.yaml
@@ -3,7 +3,7 @@ services:
- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
name: AppServer HelloWorld
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-w-policy.yaml b/guide/yaml/example_yaml/appserver-w-policy.yaml
index 52bc3b8..dd7cd1a 100644
--- a/guide/yaml/example_yaml/appserver-w-policy.yaml
+++ b/guide/yaml/example_yaml/appserver-w-policy.yaml
@@ -6,7 +6,7 @@ services:
$brooklyn:entitySpec:
type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
http.port: 8080+
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml b/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
index d86fe54..13e0ebf 100644
--- a/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
+++ b/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
@@ -4,5 +4,5 @@
effector: deploy
timeout: 5m
params:
- url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
targetName: newcontext
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml b/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
index 469b54b..54e30da 100644
--- a/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
+++ b/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
@@ -14,7 +14,7 @@
effector: deploy
timeout: 5m
params:
- url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
targetName: newcontext
- type: org.apache.brooklyn.test.framework.TestHttpCall
name: Check Deployed Webapp Status Code
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml b/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
index 25296e6..5f40abb 100644
--- a/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
+++ b/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
@@ -10,7 +10,7 @@ services:
name: My Web
id: webappcluster
brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
java.sysprops:
brooklyn.example.db.url: >
$brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
@@ -57,7 +57,7 @@ services:
effector: deploy
timeout: 5m
params:
- url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+ url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
targetName: newcontext
- type: org.apache.brooklyn.test.framework.TestHttpCall
name: Check Deployed Webapp Status Code