brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject [1/2] incubator-brooklyn git commit: Fix BROOKLYN-98: jmx.direct.port opened in security group
Date Mon, 01 Dec 2014 16:28:27 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 493c30771 -> 3960b6936


Fix BROOKLYN-98: jmx.direct.port opened in security group

- Fixes JBoss6Server deploying to aws-ec2

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3b7f0f36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3b7f0f36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3b7f0f36

Branch: refs/heads/master
Commit: 3b7f0f3681cbefe683fbd208a2e4656055e60254
Parents: 3f4ac85
Author: Aled Sage <aled.sage@gmail.com>
Authored: Mon Dec 1 14:11:25 2014 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Mon Dec 1 14:11:25 2014 +0000

----------------------------------------------------------------------
 software/base/src/main/java/brooklyn/entity/java/UsesJmx.java    | 4 +++-
 .../brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3b7f0f36/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
index fd47eb3..c315a15 100644
--- a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
+++ b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
@@ -45,9 +45,11 @@ public interface UsesJmx extends UsesJava {
     PortAttributeSensorAndConfigKey JMX_PORT = new PortAttributeSensorAndConfigKey(
         "jmx.direct.port", "JMX direct/private port (e.g. JMX RMI server port, or JMXMP port,
but not RMI registry port)", PortRanges.fromString("31001+"));
     
+    // Default is deliberately null for this unused config; if we used "31001+" then we'd
potentially give this sensor 
+    // the value 31001 and jmx.direct.port the value 31002. See https://issues.apache.org/jira/browse/BROOKLYN-98
     /** @deprecated since 0.7.0, kept for rebinding with the anonymous class; code should
only ever use {@link #JMX_PORT} */ @Deprecated
     PortAttributeSensorAndConfigKey JMX_PORT_LEGACY = new PortAttributeSensorAndConfigKey(
-            "jmx.direct.port.legacy.NOT_USED", "Legacy definition JMX direct/private port
(e.g. JMX RMI server port, or JMXMP port, but not RMI registry port)", PortRanges.fromString("31001+"))
{
+            "jmx.direct.port.legacy.NOT_USED", "Legacy definition JMX direct/private port
(e.g. JMX RMI server port, or JMXMP port, but not RMI registry port)", null) {
         private static final long serialVersionUID = 3846846080809179437L;
         @Override protected Integer convertConfigToSensor(PortRange value, Entity entity)
{
             // TODO when using JmxAgentModes.NONE we should *not* convert, but leave it null

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3b7f0f36/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java
b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java
index bc0f0d7..18939a9 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java
@@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableList;
  */
 public class JBoss6ServerAwsEc2LiveTest extends AbstractEc2LiveTest {
     
-    private URL warUrl = checkNotNull(getClass().getClassLoader().getResource("hello-world.war"));
+    private URL warUrl = checkNotNull(getClass().getClassLoader().getResource("hello-world-no-mapping.war"));
     
     @Override
     protected void doTest(Location loc) throws Exception {


Mime
View raw message