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/03/10 13:31:48 UTC
[1/3] incubator-brooklyn git commit: docs fix-up
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 683bee980 -> 0c74027ad
docs fix-up
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/51af7bd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/51af7bd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/51af7bd3
Branch: refs/heads/master
Commit: 51af7bd366af321204b016ff69223ad0c1dcf56f
Parents: 177b57b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Feb 27 13:58:39 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Feb 27 14:07:14 2015 +0000
----------------------------------------------------------------------
docs/website/developers/index.md | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51af7bd3/docs/website/developers/index.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/index.md b/docs/website/developers/index.md
index 1d3ac4a..eb74497 100644
--- a/docs/website/developers/index.md
+++ b/docs/website/developers/index.md
@@ -28,15 +28,19 @@ and are comfortable doing so.
</div>
</div>
-
-Firstly, please see our [community resources](../community/index.html), in particular:
+We heartily welome contributions and new members.
+There's nothing official needed to get involved;
+simply come say hello somewhere in the [community](../community/index.html):
- [Mailing lists](../community/mailing-lists.html)
- [IRC channel](../community/irc.html)
- [JIRA for bug tracking](https://issues.apache.org/jira/browse/BROOKLYN)
-Next, you may want to read the [Developer Guide]({{ site.path.guide }}/dev/).
+Once you have some code or a blueprint you want to share,
+there are a few instructions to note on [how to contribute](how-to-contribute.html).
-If you have changes or additions to the Brooklyn source code, we would love to
-see them! Please read our guide on [how to contribute](how-to-contribute.html).
+If you're looking to learn more about the codebase itself,
+have a look at [Developer Guide]({{ site.path.guide }}/dev/).
+There are also a number of [development bookmarks](links.html) for the tools we use
+(git, jenkins, jira).
[3/3] incubator-brooklyn git commit: This closes #535
Posted by he...@apache.org.
This closes #535
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0c74027a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0c74027a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0c74027a
Branch: refs/heads/master
Commit: 0c74027ad0dc90893a1d7130aff58cbcea7c64e7
Parents: 683bee9 ba3347c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Mar 10 12:31:33 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Mar 10 12:31:33 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/basic/BrooklynObjectInternal.java | 5 +++--
.../java/brooklyn/entity/basic/AbstractEntity.java | 8 ++++++--
docs/website/developers/index.md | 14 +++++++++-----
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-brooklyn git commit: change config() return type to
be concrete to facilitate Groovy subclasses
Posted by he...@apache.org.
change config() return type to be concrete to facilitate Groovy subclasses
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ba3347cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ba3347cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ba3347cf
Branch: refs/heads/master
Commit: ba3347cfa3b4d8beba3c905fcecf80daac5de84d
Parents: 51af7bd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Feb 27 14:05:53 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Mar 10 12:30:33 2015 +0000
----------------------------------------------------------------------
.../src/main/java/brooklyn/basic/BrooklynObjectInternal.java | 5 +++--
core/src/main/java/brooklyn/entity/basic/AbstractEntity.java | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ba3347cf/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java b/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
index 6115dd3..8271b35 100644
--- a/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
+++ b/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
@@ -18,12 +18,13 @@
*/
package brooklyn.basic;
-import brooklyn.entity.rebind.RebindSupport;
import java.util.Map;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
+import brooklyn.entity.rebind.RebindSupport;
import brooklyn.entity.rebind.Rebindable;
+import brooklyn.entity.trait.Configurable;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.guava.Maybe;
@@ -39,7 +40,7 @@ public interface BrooklynObjectInternal extends BrooklynObject, Rebindable {
ConfigurationSupportInternal config();
@Beta
- public interface ConfigurationSupportInternal extends BrooklynObject.ConfigurationSupport {
+ public interface ConfigurationSupportInternal extends Configurable.ConfigurationSupport {
/**
* Returns a read-only view of all the config key/value pairs on this entity, backed by a string-based map,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ba3347cf/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index 2fa1bf1..8c90065 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -961,8 +961,12 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
// -------- CONFIGURATION --------------
- @Override
- public ConfigurationSupportInternal config() {
+ @Override
+ @Beta
+ // the concrete type rather than an interface is returned because Groovy subclasses
+ // complain (incorrectly) if we return ConfigurationSupportInternal
+ // TODO revert to ConfigurationSupportInternal when groovy subclasses work without this (eg new groovy version)
+ public BasicConfigurationSupport config() {
return config;
}