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/09 23:22:57 UTC
[1/4] brooklyn-server git commit: Update copyright to 2016
Repository: brooklyn-server
Updated Branches:
refs/heads/master 6303d02a0 -> 46ae22385
Update copyright to 2016
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6777a313
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6777a313
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6777a313
Branch: refs/heads/master
Commit: 6777a31387c4893d5812f9fdbd28791ab66ea100
Parents: bb8980a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 9 13:17:22 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Feb 9 13:17:22 2016 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java | 2 +-
server-cli/src/main/license/files/NOTICE | 2 +-
server-cli/src/test/license/files/NOTICE | 2 +-
utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6777a313/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f790f13..6d1f608 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6777a313/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
----------------------------------------------------------------------
diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
index 619768e..a4bfc8d 100644
--- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
+++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
@@ -211,7 +211,7 @@ public abstract class AbstractMain {
System.out.println("Website: http://brooklyn.incubator.apache.org");
System.out.println("Source: https://github.com/apache/incubator-brooklyn");
System.out.println();
- System.out.println("Copyright 2011-2015 The Apache Software Foundation.");
+ System.out.println("Copyright 2011-2016 The Apache Software Foundation.");
System.out.println("Licensed under the Apache 2.0 License");
System.out.println();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6777a313/server-cli/src/main/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/server-cli/src/main/license/files/NOTICE b/server-cli/src/main/license/files/NOTICE
index f790f13..6d1f608 100644
--- a/server-cli/src/main/license/files/NOTICE
+++ b/server-cli/src/main/license/files/NOTICE
@@ -1,5 +1,5 @@
Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6777a313/server-cli/src/test/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/server-cli/src/test/license/files/NOTICE b/server-cli/src/test/license/files/NOTICE
index f790f13..6d1f608 100644
--- a/server-cli/src/test/license/files/NOTICE
+++ b/server-cli/src/test/license/files/NOTICE
@@ -1,5 +1,5 @@
Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6777a313/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded b/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
index 5f93283..f51481b 100644
--- a/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
+++ b/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
@@ -1,5 +1,5 @@
Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[4/4] brooklyn-server git commit: This closes #13
Posted by he...@apache.org.
This closes #13
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/46ae2238
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/46ae2238
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/46ae2238
Branch: refs/heads/master
Commit: 46ae22385754d708ea7457ecc68d4b28ea413e08
Parents: 6303d02 94ef5b8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 9 22:22:44 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 9 22:22:44 2016 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
.../src/test/resources/EmptySoftwareProcessWithPassword.yaml | 2 +-
.../src/test/resources/example-with-function.yaml | 2 +-
.../src/test/resources/test-app-with-enricher.yaml | 2 +-
.../camp-brooklyn/src/test/resources/test-app-with-policy.yaml | 2 +-
.../src/test/resources/test-cluster-with-member-spec.yaml | 2 +-
.../src/test/resources/test-entity-basic-template.yaml | 2 +-
.../src/test/resources/test-entity-reference-map-template.yaml | 2 +-
.../src/test/resources/test-entity-with-enricher.yaml | 2 +-
.../src/test/resources/test-entity-with-init-config.yaml | 2 +-
.../src/test/resources/test-entity-with-policy.yaml | 2 +-
.../resources/test-java-web-app-spec-and-db-with-function.yaml | 2 +-
.../src/test/resources/test-propagating-enricher.yaml | 2 +-
.../src/test/resources/test-referencing-enrichers.yaml | 2 +-
.../src/test/resources/test-referencing-entities.yaml | 2 +-
.../src/test/resources/test-referencing-policies.yaml | 2 +-
camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml | 2 +-
launcher/src/test/resources/mongo-scripts.yaml | 2 +-
.../src/main/java/org/apache/brooklyn/cli/AbstractMain.java | 6 +++---
server-cli/src/main/license/files/NOTICE | 2 +-
server-cli/src/test/license/files/NOTICE | 2 +-
utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded | 2 +-
22 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: Use 0.8.0-incubator.war URL
(instead of 0.6.0)
Posted by he...@apache.org.
Use 0.8.0-incubator.war URL (instead of 0.6.0)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/94ef5b8c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/94ef5b8c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/94ef5b8c
Branch: refs/heads/master
Commit: 94ef5b8cd3963816360de643fc20d001347acf07
Parents: 7e42ff2
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 9 13:18:59 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Feb 9 13:18:59 2016 +0000
----------------------------------------------------------------------
.../resources/test-java-web-app-spec-and-db-with-function.yaml | 2 +-
camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/94ef5b8c/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml b/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
index f51f4d7..8c7b616 100644
--- a/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml
@@ -28,7 +28,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
java.sysprops:
brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n")
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/94ef5b8c/camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml b/camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml
index 83a0fc6..d78c49b 100644
--- a/camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-tomcat-https.yaml
@@ -20,7 +20,7 @@ name: Test Tomcat HTTPS
location: localhost
services:
- type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
- 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
enabledProtocols: [https]
httpsSsl:
url: classpath://org/apache/brooklyn/entity/webapp/sample-java-keystore.jks
[2/4] brooklyn-server git commit: Remove “incubator” for URLs
Posted by he...@apache.org.
Remove “incubator” for URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7e42ff20
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7e42ff20
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7e42ff20
Branch: refs/heads/master
Commit: 7e42ff2026b57a2ace11aaef1e3a7b6e3dd2b6cc
Parents: 6777a31
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 9 13:18:25 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Feb 9 13:18:25 2016 +0000
----------------------------------------------------------------------
.../src/test/resources/EmptySoftwareProcessWithPassword.yaml | 2 +-
camp/camp-brooklyn/src/test/resources/example-with-function.yaml | 2 +-
.../camp-brooklyn/src/test/resources/test-app-with-enricher.yaml | 2 +-
camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml | 2 +-
.../src/test/resources/test-cluster-with-member-spec.yaml | 2 +-
.../src/test/resources/test-entity-basic-template.yaml | 2 +-
.../src/test/resources/test-entity-reference-map-template.yaml | 2 +-
.../src/test/resources/test-entity-with-enricher.yaml | 2 +-
.../src/test/resources/test-entity-with-init-config.yaml | 2 +-
.../src/test/resources/test-entity-with-policy.yaml | 2 +-
.../src/test/resources/test-propagating-enricher.yaml | 2 +-
.../src/test/resources/test-referencing-enrichers.yaml | 2 +-
.../src/test/resources/test-referencing-entities.yaml | 2 +-
.../src/test/resources/test-referencing-policies.yaml | 2 +-
launcher/src/test/resources/mongo-scripts.yaml | 2 +-
.../src/main/java/org/apache/brooklyn/cli/AbstractMain.java | 4 ++--
16 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml b/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
index abb301d..bac0f6b 100644
--- a/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
+++ b/camp/camp-brooklyn/src/test/resources/EmptySoftwareProcessWithPassword.yaml
@@ -20,7 +20,7 @@
name: example-with-CreatePasswordSensor
description: |
Creates an emptyService and then attaches a password to it
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
location: localhost
services:
- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/example-with-function.yaml b/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
index 918db2b..c067ac2 100644
--- a/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
+++ b/camp/camp-brooklyn/src/test/resources/example-with-function.yaml
@@ -19,7 +19,7 @@
name: example-with-function
description: |
Tests a variety of simple functional expressions
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
location: localhost
services:
- serviceType: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml b/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
index 6760410..3ce42ad 100644
--- a/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-app-with-enricher.yaml
@@ -18,7 +18,7 @@
#
name: test-app-with-enricher
description: TestEntity with Enricher at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- type: org.apache.brooklyn.entity.stock.BasicEntity
id: be1
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml b/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
index 2ac75ee..e77ac9e 100644
--- a/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-app-with-policy.yaml
@@ -18,7 +18,7 @@
#
name: test-app-with-policy
description: TestEntity with Policy at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
name: testentity
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml b/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
index 69bace1..89d35e5 100644
--- a/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-cluster-with-member-spec.yaml
@@ -18,7 +18,7 @@
#
name: test-app-with-enricher
description: Cluster of TestEntitys with member spec
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
location: localhost
services:
- type: org.apache.brooklyn.entity.group.DynamicCluster
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml b/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
index 7ace993..8f6734c 100644
--- a/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-entity-basic-template.yaml
@@ -17,7 +17,7 @@
#
name: test-entity-basic-template
description: TestEntity with templated brooklyn.config and additional config (such as services)
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- type: org.apache.brooklyn.core.test.entity.TestEntity
name: testentity
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml b/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
index c6f7b4d..64b13ae 100644
--- a/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-entity-reference-map-template.yaml
@@ -17,7 +17,7 @@
#
name: test-entity-reference-map-template
description: TestEntity with templated brooklyn.config and additional config (such as services)
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
id: one
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml b/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
index 6b1061e..0f0086c 100644
--- a/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-entity-with-enricher.yaml
@@ -18,7 +18,7 @@
#
name: test-entity-with-enricher
description: TestEntity with Enricher at entity-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
name: testentity
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml b/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
index 006350d..33f685e 100644
--- a/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-entity-with-init-config.yaml
@@ -18,7 +18,7 @@
#
name: test-entity-with-init-config
description: Creates a TestEntityWithInitConfig entity that references a 2nd test entity during its init()
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.core.test.entity.TestEntity
id: te1
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml b/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
index b93f521..3c72dba 100644
--- a/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-entity-with-policy.yaml
@@ -18,7 +18,7 @@
#
name: test-entity-with-policy
description: TestEntity with Policy at entity-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.entity.stock.BasicEntity
name: testentity
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml b/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
index 1973851..1ba4394 100644
--- a/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-propagating-enricher.yaml
@@ -18,7 +18,7 @@
#
name: test-propagating-enricher
description: TestEntity with Propagating Enricher at application-level using Brooklyn
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
services:
- serviceType: org.apache.brooklyn.core.test.entity.TestEntity
id: te1
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml b/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
index f1d6a24..5ef2d1e 100644
--- a/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-referencing-enrichers.yaml
@@ -38,7 +38,7 @@
# (g1 enricher) (g2 enricher)
name: test-referencing-enrichers
description: Test multi-layer application with each entity having an enricher referencing all other entities
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
id: app1
brooklyn.enrichers:
- enricherType: org.apache.brooklyn.camp.brooklyn.TestReferencingEnricher
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml b/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
index c87a8de..f723a40 100644
--- a/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-referencing-entities.yaml
@@ -34,7 +34,7 @@
# gchild1 gchild2
name: test-referencing-entities
description: Test multi-layer application with each entity referencing all other entities
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
id: app1
brooklyn.config:
test.reference.root: $brooklyn:root()
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/camp/camp-brooklyn/src/test/resources/test-referencing-policies.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/test-referencing-policies.yaml b/camp/camp-brooklyn/src/test/resources/test-referencing-policies.yaml
index ff06f5b..af71f8e 100644
--- a/camp/camp-brooklyn/src/test/resources/test-referencing-policies.yaml
+++ b/camp/camp-brooklyn/src/test/resources/test-referencing-policies.yaml
@@ -38,7 +38,7 @@
# (g1 policy) (g2 policy)
name: test-referencing-policies
description: Test multi-layer application with each entity having a policy referencing all other entities
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
id: app1
brooklyn.policies:
- policyType: org.apache.brooklyn.camp.brooklyn.TestReferencingPolicy
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/launcher/src/test/resources/mongo-scripts.yaml
----------------------------------------------------------------------
diff --git a/launcher/src/test/resources/mongo-scripts.yaml b/launcher/src/test/resources/mongo-scripts.yaml
index 17362e5..f97f308 100644
--- a/launcher/src/test/resources/mongo-scripts.yaml
+++ b/launcher/src/test/resources/mongo-scripts.yaml
@@ -18,7 +18,7 @@
#
name: Mongo Demo app
description: MongoDB sharded deployment with MongoDB (javascript) client
-origin: https://github.com/apache/incubator-brooklyn
+origin: https://github.com/apache/brooklyn
location: localhost
services:
- serviceType: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e42ff20/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
----------------------------------------------------------------------
diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
index a4bfc8d..73a56dd 100644
--- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
+++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java
@@ -208,8 +208,8 @@ public abstract class AbstractMain {
if (BrooklynVersion.INSTANCE.isSnapshot()) {
System.out.println("Git SHA1: " + BrooklynVersion.INSTANCE.getSha1FromOsgiManifest());
}
- System.out.println("Website: http://brooklyn.incubator.apache.org");
- System.out.println("Source: https://github.com/apache/incubator-brooklyn");
+ System.out.println("Website: http://brooklyn.apache.org");
+ System.out.println("Source: https://github.com/apache/brooklyn");
System.out.println();
System.out.println("Copyright 2011-2016 The Apache Software Foundation.");
System.out.println("Licensed under the Apache 2.0 License");