aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject aries-containers git commit: Initial unit testing for marathon binding.
Date Thu, 15 Jun 2017 09:39:18 GMT
Repository: aries-containers
Updated Branches:
  refs/heads/master 357e2ecb0 -> e33916185


Initial unit testing for marathon binding.


Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/e3391618
Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/e3391618
Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/e3391618

Branch: refs/heads/master
Commit: e3391618565bf514bd86416a7fc3e56d2ed64738
Parents: 357e2ec
Author: David Bosschaert <davidb@apache.org>
Authored: Thu Jun 15 10:39:05 2017 +0100
Committer: David Bosschaert <davidb@apache.org>
Committed: Thu Jun 15 10:39:05 2017 +0100

----------------------------------------------------------------------
 .../containers/marathon/impl/MarathonServiceManager.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-containers/blob/e3391618/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/MarathonServiceManager.java
----------------------------------------------------------------------
diff --git a/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/MarathonServiceManager.java
b/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/MarathonServiceManager.java
index fa3998b..d2e0e55 100644
--- a/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/MarathonServiceManager.java
+++ b/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/MarathonServiceManager.java
@@ -40,17 +40,21 @@ import mesosphere.marathon.client.model.v2.GetAppsResponse;
 import mesosphere.marathon.client.model.v2.Port;
 
 public class MarathonServiceManager implements ServiceManager {
-    private static final String SERVICE_NAME = "org.apache.aries.containers.service.name";
+    static final String SERVICE_NAME = "org.apache.aries.containers.service.name";
 
     private final Marathon marathonClient;
 
+    MarathonServiceManager(Marathon mc) {
+        marathonClient = mc;
+    }
+
     /**
      * Create the Marathon Service Manager.
      *
      * @param marathonURL The Marathon URL
      */
     public MarathonServiceManager(String marathonURL) {
-        marathonClient = MarathonClient.getInstance(marathonURL);
+        this(MarathonClient.getInstance(marathonURL));
     }
 
     /**


Mime
View raw message