You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/01/08 17:11:29 UTC
[1/4] incubator-brooklyn git commit: fixes qpid version numbers and
runtimeFiles in StandaloneQpidBrokerExample
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c0c655738 -> 7896657d3
fixes qpid version numbers and runtimeFiles in StandaloneQpidBrokerExample
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4386d26a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4386d26a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4386d26a
Branch: refs/heads/master
Commit: 4386d26a61887471f011b71a2da1106d69132a10
Parents: 281c889
Author: Robert Moss <ro...@gmail.com>
Authored: Tue Jan 6 15:42:09 2015 +0000
Committer: Robert Moss <ro...@gmail.com>
Committed: Tue Jan 6 15:42:09 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/demo/StandaloneQpidBrokerExample.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4386d26a/examples/simple-messaging-pubsub/src/main/java/brooklyn/demo/StandaloneQpidBrokerExample.java
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/src/main/java/brooklyn/demo/StandaloneQpidBrokerExample.java b/examples/simple-messaging-pubsub/src/main/java/brooklyn/demo/StandaloneQpidBrokerExample.java
index 82071ce..89f7874 100644
--- a/examples/simple-messaging-pubsub/src/main/java/brooklyn/demo/StandaloneQpidBrokerExample.java
+++ b/examples/simple-messaging-pubsub/src/main/java/brooklyn/demo/StandaloneQpidBrokerExample.java
@@ -37,7 +37,7 @@ public class StandaloneQpidBrokerExample extends AbstractApplication {
public static final String CUSTOM_CONFIG_PATH = "classpath://custom-config.xml";
public static final String PASSWD_PATH = "classpath://passwd";
- public static final String QPID_BDBSTORE_JAR_PATH = "classpath://qpid-bdbstore-0.14.jar";
+ public static final String QPID_BDBSTORE_JAR_PATH = "classpath://qpid-bdbstore-0.20.jar";
public static final String BDBSTORE_JAR_PATH = "classpath://je-5.0.34.jar";
public static final String DEFAULT_LOCATION = "localhost";
@@ -49,10 +49,10 @@ public class StandaloneQpidBrokerExample extends AbstractApplication {
.configure("amqpPort", 5672)
.configure("amqpVersion", AmqpServer.AMQP_0_10)
.configure("runtimeFiles", ImmutableMap.builder()
- .put(QpidBroker.CONFIG_XML, CUSTOM_CONFIG_PATH)
- .put(QpidBroker.PASSWD, PASSWD_PATH)
- .put("lib/opt/qpid-bdbstore-0.14.jar", QPID_BDBSTORE_JAR_PATH)
- .put("lib/opt/je-5.0.34.jar", BDBSTORE_JAR_PATH)
+ .put(CUSTOM_CONFIG_PATH, QpidBroker.CONFIG_XML)
+ .put(PASSWD_PATH, QpidBroker.PASSWD)
+ .put(QPID_BDBSTORE_JAR_PATH, "lib/opt/qpid-bdbstore-0.20.jar")
+ .put(BDBSTORE_JAR_PATH, "lib/opt/je-5.0.34.jar")
.build())
.configure("queue", "testQueue"));
}
[2/4] incubator-brooklyn git commit: fixes typos
Posted by sj...@apache.org.
fixes typos
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/06c8ce36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/06c8ce36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/06c8ce36
Branch: refs/heads/master
Commit: 06c8ce36e800089590ad08d22abbd9eb62858298
Parents: 7c35d20
Author: Robert Moss <ro...@gmail.com>
Authored: Wed Jan 7 13:28:37 2015 +0000
Committer: Robert Moss <ro...@gmail.com>
Committed: Wed Jan 7 13:28:37 2015 +0000
----------------------------------------------------------------------
docs/website/community/how-to-contribute-docs.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/06c8ce36/docs/website/community/how-to-contribute-docs.md
----------------------------------------------------------------------
diff --git a/docs/website/community/how-to-contribute-docs.md b/docs/website/community/how-to-contribute-docs.md
index b6b3cd5..2e29b6b 100644
--- a/docs/website/community/how-to-contribute-docs.md
+++ b/docs/website/community/how-to-contribute-docs.md
@@ -93,7 +93,7 @@ Contributing using GitHub
Our GitHub repository is located at
[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn)
-Your commit messages must properly describes the changes that have been made and
+Your commit messages must properly describe the changes that have been made and
their purpose ([here are some
guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)).
If your contributions fix a Jira issue, then ensure that you reference the issue
@@ -130,7 +130,7 @@ set of commits, and having an atomic change per commit is preferred in the end.
Use your best judgement and work with your reviewer as to when you should revise
a commit or create a new one.
-A pull request is considered ready to be merged once it gets at lease one +1
+A pull request is considered ready to be merged once it gets at least one +1
from a committer. Once all the changes have been completed and the pull request
is accepted, you may be asked to rebase it against the latest code. You may also
wish to squash some commits together and make other history revisions, to leave
[3/4] incubator-brooklyn git commit: This closes #437
Posted by sj...@apache.org.
This closes #437
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b78f0b81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b78f0b81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b78f0b81
Branch: refs/heads/master
Commit: b78f0b8192e9165c73dd027c563e7a7296c9eb3b
Parents: c0c6557 06c8ce3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jan 8 15:47:31 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jan 8 15:47:31 2015 +0000
----------------------------------------------------------------------
docs/website/community/how-to-contribute-docs.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-brooklyn git commit: This closes #434
Posted by sj...@apache.org.
This closes #434
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7896657d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7896657d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7896657d
Branch: refs/heads/master
Commit: 7896657d35d632c293f8e769e706af4e1492b263
Parents: b78f0b8 4386d26
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jan 8 15:50:17 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jan 8 15:50:17 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/demo/StandaloneQpidBrokerExample.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------