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 2012/02/20 18:15:52 UTC
svn commit: r1291380 - in /karaf/trunk:
instance/command/src/main/java/org/apache/karaf/instance/command/
instance/command/src/test/java/org/apache/karaf/instance/command/
instance/core/src/main/java/org/apache/karaf/instance/
instance/core/src/main/ja...
Author: jbonofre
Date: Mon Feb 20 17:15:52 2012
New Revision: 1291380
URL: http://svn.apache.org/viewvc?rev=1291380&view=rev
Log:
[KARAF-1197] Add verbose option to the instance service and add some log messages
Modified:
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java
karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java
karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java
karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java
karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
Modified: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java Mon Feb 20 17:15:52 2012
@@ -42,15 +42,19 @@ public class CloneCommand extends Instan
@Option(name = "-o", aliases = {"--java-opts"}, description = "JVM options to use when launching the cloned instance", required = false, multiValued = false)
String javaOpts;
+ @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
+ boolean verbose = false;
+
@Argument(index = 0, name = "name", description = "The name of the source container instance", required = true, multiValued = false)
String name;
@Argument(index = 1, name = "cloneName", description = "The name of the cloned container instance", required = true, multiValued = false)
String cloneName;
+
protected Object doExecute() throws Exception {
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, null, null);
- getInstanceService().cloneInstance(name, cloneName, settings);
+ getInstanceService().cloneInstance(name, cloneName, settings, verbose);
return null;
}
Modified: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java Mon Feb 20 17:15:52 2012
@@ -52,12 +52,15 @@ public class CreateCommand extends Insta
description = "Additional feature descriptor URLs. This option can be specified multiple times to add multiple URLs", required = false, multiValued = true)
List<String> featureURLs;
+ @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
+ boolean verbose = false;
+
@Argument(index = 0, name = "name", description="The name of the new container instance", required = true, multiValued = false)
String instance = null;
protected Object doExecute() throws Exception {
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, featureURLs, features);
- getInstanceService().createInstance(instance, settings);
+ getInstanceService().createInstance(instance, settings, verbose);
return null;
}
Modified: karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java (original)
+++ karaf/trunk/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java Mon Feb 20 17:15:52 2012
@@ -18,6 +18,7 @@ package org.apache.karaf.instance.comman
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
/**
* Rename an existing Karaf container instance.
@@ -25,6 +26,9 @@ import org.apache.karaf.shell.commands.C
@Command(scope = "instance", name = "rename", description = "Rename an existing container instance.")
public class RenameCommand extends InstanceCommandSupport {
+ @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
+ boolean verbose = false;
+
@Argument(index = 0, name = "name", description = "The name of the container instance to rename", required = true, multiValued = false)
String instance = null;
@@ -32,7 +36,7 @@ public class RenameCommand extends Insta
String newName = null;
protected Object doExecute() throws Exception {
- getInstanceService().renameInstance(instance, newName);
+ getInstanceService().renameInstance(instance, newName, verbose);
return null;
}
Modified: karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java (original)
+++ karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java Mon Feb 20 17:15:52 2012
@@ -41,12 +41,13 @@ public class CreateCommandTest extends T
cc.features = Arrays.asList("abc", "def");
cc.featureURLs = Collections.singletonList("http://something");
cc.instance = "myInstance";
+ cc.verbose = true;
EasyMock.verify(instanceService); // check precondition
EasyMock.reset(instanceService);
InstanceSettings expectedIS =
new InstanceSettings(9941, 1122, 44444, "top", "foo", Collections.singletonList("http://something"), Arrays.asList("abc", "def"));
- EasyMock.expect(instanceService.createInstance("myInstance", expectedIS)).andReturn(null);
+ EasyMock.expect(instanceService.createInstance("myInstance", expectedIS, true)).andReturn(null);
EasyMock.replay(instanceService);
cc.doExecute();
Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java Mon Feb 20 17:15:52 2012
@@ -18,11 +18,11 @@ package org.apache.karaf.instance;
public interface InstanceService {
- Instance createInstance(String name, InstanceSettings settings) throws Exception;
+ Instance createInstance(String name, InstanceSettings settings, boolean printOutput) throws Exception;
- void renameInstance(String name, String newName) throws Exception;
+ void renameInstance(String name, String newName, boolean printOutput) throws Exception;
- Instance cloneInstance(String name, String cloneName, InstanceSettings settings) throws Exception;
+ Instance cloneInstance(String name, String cloneName, InstanceSettings settings, boolean printOutput) throws Exception;
Instance[] getInstances();
Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java Mon Feb 20 17:15:52 2012
@@ -137,7 +137,7 @@ public class InstanceServiceImpl impleme
}
}
- public synchronized Instance createInstance(String name, InstanceSettings settings) throws Exception {
+ public synchronized Instance createInstance(String name, InstanceSettings settings, boolean printOutput) throws Exception {
if (instances.get(name) != null) {
throw new IllegalArgumentException("Instance '" + name + "' already exists");
}
@@ -158,25 +158,30 @@ public class InstanceServiceImpl impleme
if (rmiServerPort <= 0) {
rmiServerPort = ++defaultRmiServerPortStart;
}
- println(Ansi.ansi().a("Creating new instance on SSH port ").a(sshPort).a(" and RMI registry port ").a(rmiRegistryPort).a(" / RMI server port ").a(rmiServerPort).a(" at: ").a(Ansi.Attribute.INTENSITY_BOLD).a(karafBase).a(Ansi.Attribute.RESET).toString());
+
+ LOGGER.info("Creating new instance on SSH port {} and registry port {} / RMI server port {} at: {}", new Object[]{ sshPort, rmiRegistryPort, rmiServerPort, karafBase });
- mkdir(karafBase, "bin");
- mkdir(karafBase, "etc");
- mkdir(karafBase, "system");
- mkdir(karafBase, "deploy");
- mkdir(karafBase, "data");
-
- copyResourceToDir(karafBase, "etc/config.properties", true);
- copyResourceToDir(karafBase, "etc/jre.properties", true);
- copyResourceToDir(karafBase, "etc/custom.properties", true);
- copyResourceToDir(karafBase, "etc/java.util.logging.properties", true);
- copyResourceToDir(karafBase, "etc/org.apache.felix.fileinstall-deploy.cfg", true);
- copyResourceToDir(karafBase, "etc/org.apache.karaf.log.cfg", true);
- copyResourceToDir(karafBase, FEATURES_CFG, true);
- copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", true);
- copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
-// copyResourceToDir(karafBase, "etc/startup.properties", true);
- copyResourceToDir(karafBase, "etc/users.properties", true);
+ if (printOutput) {
+ println(Ansi.ansi().a("Creating new instance on SSH port ").a(sshPort).a(" and RMI registry port ").a(rmiRegistryPort).a(" / RMI server port ").a(rmiServerPort).a(" at: ").a(Ansi.Attribute.INTENSITY_BOLD).a(karafBase).a(Ansi.Attribute.RESET).toString());
+ }
+
+ mkdir(karafBase, "bin", printOutput);
+ mkdir(karafBase, "etc", printOutput);
+ mkdir(karafBase, "system", printOutput);
+ mkdir(karafBase, "deploy", printOutput);
+ mkdir(karafBase, "data", printOutput);
+
+ copyResourceToDir(karafBase, "etc/config.properties", true, printOutput);
+ copyResourceToDir(karafBase, "etc/jre.properties", true, printOutput);
+ copyResourceToDir(karafBase, "etc/custom.properties", true, printOutput);
+ copyResourceToDir(karafBase, "etc/java.util.logging.properties", true, printOutput);
+ copyResourceToDir(karafBase, "etc/org.apache.felix.fileinstall-deploy.cfg", true, printOutput);
+ copyResourceToDir(karafBase, "etc/org.apache.karaf.log.cfg", true, printOutput);
+ copyResourceToDir(karafBase, FEATURES_CFG, true, printOutput);
+ copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", true, printOutput);
+ copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", true, printOutput);
+ // copyResourceToDir(karafBase, "etc/startup.properties", true);
+ copyResourceToDir(karafBase, "etc/users.properties", true, printOutput);
// The startup.properties is now generated by the karaf maven plugin, so
// we use the one from the root instance instead of embedding it
@@ -190,17 +195,17 @@ public class InstanceServiceImpl impleme
props.put("${SUBST-SSH-PORT}", Integer.toString(sshPort));
props.put("${SUBST-RMI-REGISTRY-PORT}", Integer.toString(rmiRegistryPort));
props.put("${SUBST-RMI-SERVER-PORT}", Integer.toString(rmiServerPort));
- copyFilteredResourceToDir(karafBase, "etc/system.properties", props);
- copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.shell.cfg", props);
- copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.management.cfg", props);
+ copyFilteredResourceToDir(karafBase, "etc/system.properties", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.shell.cfg", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.management.cfg", props, printOutput);
// If we use batch files, use batch files, else use bash scripts (even on cygwin)
boolean windows = System.getProperty("os.name").startsWith("Win");
- copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props);
- copyFilteredResourceToDir(karafBase, "bin/start.bat", props);
- copyFilteredResourceToDir(karafBase, "bin/stop.bat", props);
- copyFilteredResourceToDir(karafBase, "bin/karaf", props);
- copyFilteredResourceToDir(karafBase, "bin/start", props);
- copyFilteredResourceToDir(karafBase, "bin/stop", props);
+ copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/start.bat", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/stop.bat", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/karaf", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/start", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/stop", props, printOutput);
if ( !windows ) {
chmod(new File(karafBase, "bin/karaf"), "a+x");
chmod(new File(karafBase, "bin/start"), "a+x");
@@ -253,7 +258,7 @@ public class InstanceServiceImpl impleme
instances.remove(name);
}
- public synchronized void renameInstance(String oldName, String newName) throws Exception {
+ public synchronized void renameInstance(String oldName, String newName, boolean printOutput) throws Exception {
if (instances.get(newName) != null) {
throw new IllegalArgumentException("Instance " + newName + " already exists");
}
@@ -268,10 +273,15 @@ public class InstanceServiceImpl impleme
throw new IllegalStateException("Instance not stopped");
}
- println(Ansi.ansi().a("Renaming instance ")
+ LOGGER.info("Renaming instance {} to {}", oldName, newName);
+
+ if (printOutput) {
+ println(Ansi.ansi().a("Renaming instance ")
.a(Ansi.Attribute.INTENSITY_BOLD).a(oldName).a(Ansi.Attribute.RESET)
.a(" to ")
.a(Ansi.Attribute.INTENSITY_BOLD).a(newName).a(Ansi.Attribute.RESET).toString());
+ }
+
// remove the old instance
instances.remove(oldName);
// update instance
@@ -304,7 +314,7 @@ public class InstanceServiceImpl impleme
saveState();
}
- public synchronized Instance cloneInstance(String name, String cloneName, InstanceSettings settings) throws Exception {
+ public synchronized Instance cloneInstance(String name, String cloneName, InstanceSettings settings, boolean printOutput) throws Exception {
if (instances.get(cloneName) != null) {
throw new IllegalArgumentException("Instance " + cloneName + " already exists");
}
@@ -319,7 +329,12 @@ public class InstanceServiceImpl impleme
throw new IllegalStateException("Instance not stopped");
}
- println(Ansi.ansi().a("Cloning instance ").a(Ansi.Attribute.INTENSITY_BOLD).a(name).a(Ansi.Attribute.RESET).a(" into ").a(Ansi.Attribute.INTENSITY_BOLD).a(cloneName).toString());
+ LOGGER.info("Cloning instance {} into {}", name, cloneName);
+
+ if (printOutput) {
+ println(Ansi.ansi().a("Cloning instance ").a(Ansi.Attribute.INTENSITY_BOLD).a(name).a(Ansi.Attribute.RESET).a(" into ").a(Ansi.Attribute.INTENSITY_BOLD).a(cloneName).toString());
+ }
+
// define the clone instance location
String cloneLocationPath = settings.getLocation() != null ? settings.getLocation() : name;
File cloneLocation = new File(cloneLocationPath);
@@ -380,10 +395,17 @@ public class InstanceServiceImpl impleme
saveStorage(storage, new File(storageLocation, STORAGE_FILE), "Instance Service storage");
}
- private void copyResourceToDir(File target, String resource, boolean text) throws Exception {
+ private void copyResourceToDir(File target, String resource, boolean text, boolean printOutput) throws Exception {
File outFile = new File(target, resource);
+
if( !outFile.exists() ) {
- println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
+
+ LOGGER.info("Creating file: {}", outFile.getPath());
+
+ if (printOutput) {
+ println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
+ }
+
InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/instance/resources/" + resource);
if (is == null) {
throw new IOException("Unable to find resource " + resource);
@@ -437,10 +459,16 @@ public class InstanceServiceImpl impleme
bak.delete();
}
- private void copyFilteredResourceToDir(File target, String resource, HashMap<String, String> props) throws Exception {
+ private void copyFilteredResourceToDir(File target, String resource, HashMap<String, String> props, boolean printOutput) throws Exception {
File outFile = new File(target, resource);
if( !outFile.exists() ) {
- println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
+
+ LOGGER.info("Creating file: {}", outFile.getPath());
+
+ if (printOutput) {
+ println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
+ }
+
InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/instance/resources/" + resource);
copyAndFilterResource(is, new FileOutputStream(outFile), props);
}
@@ -497,10 +525,16 @@ public class InstanceServiceImpl impleme
return line;
}
- private void mkdir(File karafBase, String path) {
+ private void mkdir(File karafBase, String path, boolean printOutput) {
File file = new File(karafBase, path);
if( !file.exists() ) {
- println(Ansi.ansi().a("Creating dir: ").a(Ansi.Attribute.INTENSITY_BOLD).a(file.getPath()).a(Ansi.Attribute.RESET).toString());
+
+ LOGGER.info("Creating dir: {}", file.getPath());
+
+ if (printOutput) {
+ println(Ansi.ansi().a("Creating dir: ").a(Ansi.Attribute.INTENSITY_BOLD).a(file.getPath()).a(Ansi.Attribute.RESET).toString());
+ }
+
file.mkdirs();
}
}
Modified: karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java (original)
+++ karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java Mon Feb 20 17:15:52 2012
@@ -75,7 +75,7 @@ public class InstanceServiceImplTest ext
System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null);
- Instance instance = service.createInstance(getName(), settings);
+ Instance instance = service.createInstance(getName(), settings, true);
assertFileExists(instance.getLocation(), "etc/config.properties");
assertFileExists(instance.getLocation(), "etc/users.properties");
@@ -102,9 +102,9 @@ public class InstanceServiceImplTest ext
System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null);
- Instance instance = service.createInstance(getName(), settings);
+ Instance instance = service.createInstance(getName(), settings, true);
- service.renameInstance(getName(), getName() + "b");
+ service.renameInstance(getName(), getName() + "b", true);
assertNotNull(service.getInstance(getName() + "b"));
}
Modified: karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java (original)
+++ karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java Mon Feb 20 17:15:52 2012
@@ -58,7 +58,7 @@ public class InstanceServiceMBeanImpl ex
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts,
parseStringList(featureURLs), parseStringList(features));
- Instance inst = instanceService.createInstance(name, settings);
+ Instance inst = instanceService.createInstance(name, settings, false);
if (inst != null) {
return inst.getPid();
} else {
@@ -95,7 +95,7 @@ public class InstanceServiceMBeanImpl ex
}
public void renameInstance(String originalName, String newName) throws Exception {
- instanceService.renameInstance(originalName, newName);
+ instanceService.renameInstance(originalName, newName, false);
}
public TabularData getInstances() throws Exception {
Modified: karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java (original)
+++ karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java Mon Feb 20 17:15:52 2012
@@ -40,7 +40,7 @@ public class InstanceServiceMBeanImplTes
EasyMock.replay(inst);
InstanceService instanceService = EasyMock.createMock(InstanceService.class);
- EasyMock.expect(instanceService.createInstance("t1", instanceSettings)).andReturn(inst);
+ EasyMock.expect(instanceService.createInstance("t1", instanceSettings, false)).andReturn(inst);
EasyMock.replay(instanceService);
InstanceServiceMBeanImpl ab = new InstanceServiceMBeanImpl();
@@ -55,7 +55,7 @@ public class InstanceServiceMBeanImplTes
Collections.<String>emptyList(), Collections.<String>emptyList());
InstanceService instanceService = EasyMock.createMock(InstanceService.class);
- EasyMock.expect(instanceService.createInstance("t1", instanceSettings)).andReturn(null);
+ EasyMock.expect(instanceService.createInstance("t1", instanceSettings, false)).andReturn(null);
EasyMock.replay(instanceService);
InstanceServiceMBeanImpl ab = new InstanceServiceMBeanImpl();
Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java (original)
+++ karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java Mon Feb 20 17:15:52 2012
@@ -317,7 +317,7 @@ public class InstancePlugin extends Abst
private boolean createInstance(String name, InstanceSettings settings) {
try {
- instanceService.createInstance(name, settings);
+ instanceService.createInstance(name, settings, false);
return true;
} catch (Exception ex) {
Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex);
Modified: karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java?rev=1291380&r1=1291379&r2=1291380&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java (original)
+++ karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Mon Feb 20 17:15:52 2012
@@ -56,7 +56,7 @@ public class InstancePluginTest extends
InstanceSettings instanceSettings =
new InstanceSettings(123, 456, 789, null, null, Collections.singletonList("http://someURL"), Arrays.asList("abc", "def"));
InstanceService instanceService = EasyMock.createMock(InstanceService.class);
- EasyMock.expect(instanceService.createInstance("instance1", instanceSettings)).andReturn(null);
+ EasyMock.expect(instanceService.createInstance("instance1", instanceSettings, false)).andReturn(null);
EasyMock.expect(instanceService.getInstances()).andReturn(new Instance[]{}).anyTimes();
EasyMock.replay(instanceService);