You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/07/15 07:53:15 UTC
git commit: [KARAF-3115] Fix typo mistake in instance:create command
and add address arguments to the create operation of the InstanceMBean
Repository: karaf
Updated Branches:
refs/heads/master b0e2b26ca -> f703814bf
[KARAF-3115] Fix typo mistake in instance:create command and add address arguments to the create operation of the InstanceMBean
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f703814b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f703814b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f703814b
Branch: refs/heads/master
Commit: f703814bf3360fdd02cab690191634d82e90dd9f
Parents: b0e2b26
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jul 15 07:52:21 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jul 15 07:52:21 2014 +0200
----------------------------------------------------------------------
.../karaf/instance/command/CreateCommand.java | 2 +-
.../karaf/instance/core/InstancesMBean.java | 18 ++++++++++++++-
.../core/internal/InstancesMBeanImpl.java | 24 ++++++++++++++++++--
.../internal/InstanceServiceMBeanImplTest.java | 4 ++--
4 files changed, 42 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f703814b/instance/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/command/CreateCommand.java b/instance/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
index 2d4ac1c..46d66f9 100644
--- a/instance/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
+++ b/instance/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
@@ -72,7 +72,7 @@ public class CreateCommand extends InstanceCommandSupport
@Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
boolean verbose = false;
- @Option(name = "-a", aliases = {"--adderss"}, description = "IP address of the new container instance running on(When Virtual IP is used)", required = false, multiValued = false)
+ @Option(name = "-a", aliases = {"--address"}, description = "IP address of the new container instance running on (when virtual IP is used)", required = false, multiValued = false)
String address = "0.0.0.0";
@Argument(index = 0, name = "name", description="The name of the new container instance", required = true, multiValued = false)
http://git-wip-us.apache.org/repos/asf/karaf/blob/f703814b/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java b/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
index f75e099..8faa363 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
@@ -35,7 +35,23 @@ public interface InstancesMBean {
INSTANCE_RMI_SERVER_PORT, INSTANCE_STATE, INSTANCE_LOCATION, INSTANCE_JAVAOPTS };
// Operations
- int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts, String features, String featureURLs) throws MBeanException;
+ int createInstance(String name,
+ int sshPort,
+ int rmiRegistryPort,
+ int rmiServerPort,
+ String location,
+ String javaOpts,
+ String features,
+ String featureURLs) throws MBeanException;
+ int createInstance(String name,
+ int sshPort,
+ int rmiRegistryPort,
+ int rmiServerPort,
+ String location,
+ String javaOpts,
+ String features,
+ String featureURLs,
+ String address) throws MBeanException;
void changeSshPort(String name, int port) throws MBeanException;
void changeRmiRegistryPort(String name, int port) throws MBeanException;
void changeRmiServerPort(String name, int port) throws MBeanException;
http://git-wip-us.apache.org/repos/asf/karaf/blob/f703814b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
index b95e4dc..1aaf8b8 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
@@ -41,7 +41,27 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
this.instanceService = instanceService;
}
- public int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts, String features, String featureURLs)
+ public int createInstance(String name,
+ int sshPort,
+ int rmiRegistryPort,
+ int rmiServerPort,
+ String location,
+ String javaOpts,
+ String features,
+ String featuresURLs)
+ throws MBeanException {
+ return this.createInstance(name, sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, features, featuresURLs, "localhost");
+ }
+
+ public int createInstance(String name,
+ int sshPort,
+ int rmiRegistryPort,
+ int rmiServerPort,
+ String location,
+ String javaOpts,
+ String features,
+ String featureURLs,
+ String address)
throws MBeanException {
try {
if ("".equals(location)) {
@@ -52,7 +72,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
}
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts,
- parseStringList(featureURLs), parseStringList(features));
+ parseStringList(featureURLs), parseStringList(features), address);
Instance inst = instanceService.createInstance(name, settings, false);
if (inst != null) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/f703814b/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java
----------------------------------------------------------------------
diff --git a/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java b/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java
index bb67041..309acfb 100644
--- a/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java
+++ b/instance/src/test/java/org/apache/karaf/instance/core/management/internal/InstanceServiceMBeanImplTest.java
@@ -36,7 +36,7 @@ public class InstanceServiceMBeanImplTest extends TestCase {
public void testCreateInstance() throws Exception {
final InstanceSettings instanceSettings = new InstanceSettings(123, 456,789, "somewhere", "someopts",
- Collections.<String>emptyList(), Arrays.asList("webconsole", "funfeat"));
+ Collections.<String>emptyList(), Arrays.asList("webconsole", "funfeat"), "localhost");
final Instance inst = EasyMock.createMock(Instance.class);
EasyMock.expect(inst.getPid()).andReturn(42);
@@ -52,7 +52,7 @@ public class InstanceServiceMBeanImplTest extends TestCase {
public void testCreateInstance2() throws Exception {
final InstanceSettings instanceSettings = new InstanceSettings(0, 0, 0, null, null,
- Collections.<String>emptyList(), Collections.<String>emptyList());
+ Collections.<String>emptyList(), Collections.<String>emptyList(), "localhost");
InstanceService instanceService = EasyMock.createMock(InstanceService.class);
EasyMock.expect(instanceService.createInstance("t1", instanceSettings, false)).andReturn(null);