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 2014/07/25 19:56:58 UTC
[02/11] git commit: MachineEntity extends EmptySoftwareProcess
MachineEntity extends EmptySoftwareProcess
Otherwise it's not constructable
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fb4c4dce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fb4c4dce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fb4c4dce
Branch: refs/heads/master
Commit: fb4c4dce4ae39d6ea72f71b16de283cab46544cd
Parents: e315de3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Jul 18 15:36:46 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Jul 21 10:18:00 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/entity/machine/MachineEntity.java | 4 ++--
.../src/main/java/brooklyn/entity/machine/MachineEntityImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fb4c4dce/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java
index 68220d6..c353e80 100644
--- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java
+++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java
@@ -20,14 +20,14 @@ package brooklyn.entity.machine;
import brooklyn.entity.annotation.Effector;
import brooklyn.entity.annotation.EffectorParam;
+import brooklyn.entity.basic.EmptySoftwareProcess;
import brooklyn.entity.basic.MethodEffector;
-import brooklyn.entity.basic.SoftwareProcess;
import brooklyn.entity.proxying.ImplementedBy;
import brooklyn.event.AttributeSensor;
import brooklyn.util.time.Duration;
@ImplementedBy(MachineEntityImpl.class)
-public interface MachineEntity extends SoftwareProcess {
+public interface MachineEntity extends EmptySoftwareProcess {
AttributeSensor<Duration> UPTIME = MachineAttributes.UPTIME;
AttributeSensor<Double> LOAD_AVERAGE = MachineAttributes.LOAD_AVERAGE;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fb4c4dce/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
index ab17be1..4bb64a4 100644
--- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
+++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.EmptySoftwareProcessDriver;
-import brooklyn.entity.basic.SoftwareProcessImpl;
+import brooklyn.entity.basic.EmptySoftwareProcessImpl;
import brooklyn.entity.software.SshEffectorTasks;
import brooklyn.event.feed.ssh.SshFeed;
import brooklyn.event.feed.ssh.SshPollConfig;
@@ -42,7 +42,7 @@ import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Splitter;
-public class MachineEntityImpl extends SoftwareProcessImpl implements MachineEntity {
+public class MachineEntityImpl extends EmptySoftwareProcessImpl implements MachineEntity {
private static final Logger LOG = LoggerFactory.getLogger(MachineEntityImpl.class);