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 11:14:58 UTC
svn commit: r1291178 [2/3] - in /karaf/trunk: ./ admin/ admin/command/
admin/command/src/main/java/org/apache/karaf/admin/command/
admin/command/src/main/java/org/apache/karaf/admin/command/completers/
admin/command/src/main/java/org/apache/karaf/admin...
Copied: karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java (from r1291022, karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/command/CreateCommandTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java?p2=karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java&p1=karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/command/CreateCommandTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/command/CreateCommandTest.java (original)
+++ karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java Mon Feb 20 10:14:50 2012
@@ -14,24 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.command;
+package org.apache.karaf.instance.command;
import java.util.Arrays;
import java.util.Collections;
import junit.framework.TestCase;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.InstanceSettings;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.InstanceSettings;
import org.easymock.EasyMock;
public class CreateCommandTest extends TestCase {
+
public void testCreateCommandExecute() throws Exception {
- AdminService adminService = EasyMock.createMock(AdminService.class);
- EasyMock.replay(adminService);
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.replay(instanceService);
CreateCommand cc = new CreateCommand();
- cc.setAdminService(adminService);
+ cc.setInstanceService(instanceService);
cc.sshPort = 9941;
cc.rmiRegistryPort = 1122;
cc.rmiServerPort = 44444;
@@ -41,14 +42,15 @@ public class CreateCommandTest extends T
cc.featureURLs = Collections.singletonList("http://something");
cc.instance = "myInstance";
- EasyMock.verify(adminService); // check precondition
- EasyMock.reset(adminService);
+ 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(adminService.createInstance("myInstance", expectedIS)).andReturn(null);
- EasyMock.replay(adminService);
+ EasyMock.expect(instanceService.createInstance("myInstance", expectedIS)).andReturn(null);
+ EasyMock.replay(instanceService);
cc.doExecute();
- EasyMock.verify(adminService);
+ EasyMock.verify(instanceService);
}
+
}
Copied: karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java (from r1291022, karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java?p2=karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java&p1=karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java (original)
+++ karaf/trunk/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.main;
+package org.apache.karaf.instance.main;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -28,9 +28,9 @@ import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.command.AdminCommandSupport;
-import org.apache.karaf.admin.internal.AdminServiceImpl;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.command.InstanceCommandSupport;
+import org.apache.karaf.instance.internal.InstanceServiceImpl;
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
@@ -123,37 +123,37 @@ public class ExecuteTest extends TestCas
p.setProperty("ssh.port", "1302");
p.setProperty("rmi.registry.port", "1122");
p.setProperty("rmi.server.port", "44444");
- FileOutputStream fos = new FileOutputStream(new File(tempFile, AdminServiceImpl.STORAGE_FILE));
+ FileOutputStream fos = new FileOutputStream(new File(tempFile, InstanceServiceImpl.STORAGE_FILE));
p.store(fos, "");
fos.close();
- final List<AdminServiceImpl> admins = new ArrayList<AdminServiceImpl>();
+ final List<InstanceServiceImpl> instanceServices = new ArrayList<InstanceServiceImpl>();
try {
- AdminCommandSupport mockCommand = EasyMock.createStrictMock(AdminCommandSupport.class);
- mockCommand.setAdminService((AdminService) EasyMock.anyObject());
+ InstanceCommandSupport mockCommand = EasyMock.createStrictMock(InstanceCommandSupport.class);
+ mockCommand.setInstanceService((InstanceService) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
- AdminServiceImpl svc = (AdminServiceImpl) EasyMock.getCurrentArguments()[0];
- assertEquals(tempFile, svc.getStorageLocation());
- admins.add(svc);
+ InstanceServiceImpl instanceService = (InstanceServiceImpl) EasyMock.getCurrentArguments()[0];
+ assertEquals(tempFile, instanceService.getStorageLocation());
+ instanceServices.add(instanceService);
return null;
}
});
EasyMock.expect(mockCommand.execute(null)).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
- // The Admin Service should be initialized at this point.
+ // The Instance Service should be initialized at this point.
// One way to find this out is by reading out the port number
- AdminServiceImpl admin = admins.get(0);
- Field sshField = AdminServiceImpl.class.getDeclaredField("defaultSshPortStart");
+ InstanceServiceImpl instanceService = instanceServices.get(0);
+ Field sshField = InstanceServiceImpl.class.getDeclaredField("defaultSshPortStart");
sshField.setAccessible(true);
- assertEquals(1302, sshField.get(admin));
- Field rmiRegistryField = AdminServiceImpl.class.getDeclaredField("defaultRmiRegistryPortStart");
+ assertEquals(1302, sshField.get(instanceService));
+ Field rmiRegistryField = InstanceServiceImpl.class.getDeclaredField("defaultRmiRegistryPortStart");
rmiRegistryField.setAccessible(true);
- assertEquals(1122, rmiRegistryField.get(admin));
- Field rmiServerField = AdminServiceImpl.class.getDeclaredField("defaultRmiServerPortStart");
+ assertEquals(1122, rmiRegistryField.get(instanceService));
+ Field rmiServerField = InstanceServiceImpl.class.getDeclaredField("defaultRmiServerPortStart");
rmiServerField.setAccessible(true);
- assertEquals(44444, rmiServerField.get(admin));
+ assertEquals(44444, rmiServerField.get(instanceService));
return null;
}
});
@@ -182,4 +182,5 @@ public class ExecuteTest extends TestCas
}
tmp.delete();
}
+
}
Copied: karaf/trunk/instance/core/NOTICE (from r1291022, karaf/trunk/admin/core/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/NOTICE?p2=karaf/trunk/instance/core/NOTICE&p1=karaf/trunk/admin/core/NOTICE&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/pom.xml (from r1291022, karaf/trunk/admin/core/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/pom.xml?p2=karaf/trunk/instance/core/pom.xml&p1=karaf/trunk/admin/core/pom.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Mon Feb 20 10:14:50 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>admin</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>instance</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Admin :: Core</name>
- <description>Core implementation of the admin feature to manipulate Karaf child instances.</description>
+ <name>Apache Karaf :: Instance :: Core</name>
+ <description>Core implementation of the instance feature to manipulate Karaf child instances.</description>
<properties>
<appendedResourcesDirectory>${project.basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -102,7 +102,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.outputDirectory}/org/apache/karaf/admin/</outputDirectory>
+ <outputDirectory>${project.build.outputDirectory}/org/apache/karaf/instance/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/../../assemblies/features/framework/src/main/resources</directory>
@@ -132,11 +132,11 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.admin;version=${project.version},
+ org.apache.karaf.instance;version=${project.version},
org.apache.karaf.jpm;version=${project.version}
</Export-Package>
<Import-Package>
- !org.apache.karaf.admin,
+ !org.apache.karaf.instance,
!org.apache.karaf.jpm,
javax.management,
javax.management.loading,
@@ -150,8 +150,8 @@
</Import-Package>
<Private-Package>
org.apache.felix.utils.properties,
- org.apache.karaf.admin.resources*,
- org.apache.karaf.admin.internal,
+ org.apache.karaf.instance.resources*,
+ org.apache.karaf.instance.internal,
org.apache.karaf.jpm.impl,
</Private-Package>
</instructions>
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/Instance.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/Instance.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/Instance.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/Instance.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/Instance.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/Instance.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/Instance.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin;
+package org.apache.karaf.instance;
public interface Instance {
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceService.java Mon Feb 20 10:14:50 2012
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin;
+package org.apache.karaf.instance;
-public interface AdminService {
+public interface InstanceService {
Instance createInstance(String name, InstanceSettings settings) throws Exception;
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceSettings.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/InstanceSettings.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceSettings.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceSettings.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/InstanceSettings.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/InstanceSettings.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/InstanceSettings.java Mon Feb 20 10:14:50 2012
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin;
+package org.apache.karaf.instance;
import java.util.List;
public class InstanceSettings {
+
private final int sshPort;
private final int rmiRegistryPort;
private final int rmiServerPort;
@@ -92,4 +93,5 @@ public class InstanceSettings {
result = 31 * result + (features != null ? features.hashCode() : 0);
return result;
}
+
}
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceImpl.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceImpl.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceImpl.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceImpl.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.internal;
+package org.apache.karaf.instance.internal;
import java.io.BufferedReader;
import java.io.File;
@@ -31,7 +31,7 @@ import java.net.URL;
import java.net.UnknownHostException;
import org.apache.felix.utils.properties.Properties;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.Instance;
import org.apache.karaf.jpm.Process;
import org.apache.karaf.jpm.ProcessBuilderFactory;
import org.apache.karaf.jpm.impl.ScriptUtils;
@@ -49,18 +49,18 @@ public class InstanceImpl implements Ins
private static final String KARAF_SHUTDOWN_COMMAND = "karaf.shutdown.command";
private static final String DEFAULT_SHUTDOWN_COMMAND = "SHUTDOWN";
- private AdminServiceImpl service;
+ private InstanceServiceImpl service;
private String name;
private String location;
private String javaOpts;
private Process process;
private boolean root;
- public InstanceImpl(AdminServiceImpl service, String name, String location, String javaOpts) {
+ public InstanceImpl(InstanceServiceImpl service, String name, String location, String javaOpts) {
this(service, name, location, javaOpts, false);
}
- public InstanceImpl(AdminServiceImpl service, String name, String location, String javaOpts, boolean root) {
+ public InstanceImpl(InstanceServiceImpl service, String name, String location, String javaOpts, boolean root) {
this.service = service;
this.name = name;
this.location = location;
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/internal/InstanceServiceImpl.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.internal;
+package org.apache.karaf.instance.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -29,20 +29,20 @@ import java.util.Map;
import java.util.Properties;
import java.util.Scanner;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.Instance;
-import org.apache.karaf.admin.InstanceSettings;
+import org.apache.karaf.instance.InstanceSettings;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.Instance;
import org.fusesource.jansi.Ansi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AdminServiceImpl implements AdminService {
+public class InstanceServiceImpl implements InstanceService {
public static final String STORAGE_FILE = "instance.properties";
public static final String BACKUP_EXTENSION = ".bak";
private static final String FEATURES_CFG = "etc/org.apache.karaf.features.cfg";
- private static final Logger LOGGER = LoggerFactory.getLogger(AdminServiceImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(InstanceServiceImpl.class);
private Map<String, Instance> instances = new HashMap<String, Instance>();
@@ -377,14 +377,14 @@ public class AdminServiceImpl implements
storage.setProperty("item." + i + ".pid", Integer.toString(data[i].getPid()));
storage.setProperty("item." + i + ".opts", data[i].getJavaOpts() != null ? data[i].getJavaOpts() : "");
}
- saveStorage(storage, new File(storageLocation, STORAGE_FILE), "Admin Service storage");
+ saveStorage(storage, new File(storageLocation, STORAGE_FILE), "Instance Service storage");
}
private void copyResourceToDir(File target, String resource, boolean text) 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());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/resources/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/instance/resources/" + resource);
if (is == null) {
throw new IOException("Unable to find resource " + resource);
}
@@ -441,7 +441,7 @@ public class AdminServiceImpl implements
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());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/resources/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/instance/resources/" + resource);
copyAndFilterResource(is, new FileOutputStream(outFile), props);
}
}
@@ -510,7 +510,7 @@ public class AdminServiceImpl implements
builder.command("chmod", mode, serviceFile.getCanonicalPath());
Process p = builder.start();
- // gnodet: Fix SMX4KNL-46: cpu goes to 100% after running the 'admin create' command
+ // gnodet: Fix SMX4KNL-46: cpu goes to 100% after running the 'instance:create' command
// Not sure exactly what happens, but commenting the process io redirection seems
// to work around the problem.
//
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/Process.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/Process.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/Process.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/Process.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/Process.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java (from r1291022, karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java?p2=karaf/trunk/instance/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java&p1=karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml (from r1291022, karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml?p2=karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml&p1=karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml (original)
+++ karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml Mon Feb 20 10:14:50 2012
@@ -21,11 +21,11 @@
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-activation="lazy">
- <bean id="adminService" class="org.apache.karaf.admin.internal.AdminServiceImpl" init-method="init">
+ <bean id="instanceService" class="org.apache.karaf.instance.internal.InstanceServiceImpl" init-method="init">
<property name="storageLocation" value="${karaf.instances}" />
</bean>
- <service ref="adminService" interface="org.apache.karaf.admin.AdminService" />
+ <service ref="instanceService" interface="org.apache.karaf.instance.InstanceService" />
<!-- Allow the use of system properties -->
<ext:property-placeholder />
Copied: karaf/trunk/instance/core/src/main/resources/OSGI-INF/bundle.info (from r1291022, karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/OSGI-INF/bundle.info?p2=karaf/trunk/instance/core/src/main/resources/OSGI-INF/bundle.info&p1=karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/OSGI-INF/bundle.info (original)
+++ karaf/trunk/instance/core/src/main/resources/OSGI-INF/bundle.info Mon Feb 20 10:14:50 2012
@@ -9,9 +9,9 @@ Maven URL:
h1. Description
-This bundle is the core implementation of the Karaf admin feature.
+This bundle is the core implementation of the Karaf instance feature.
-Karaf admin allows you to manage Karaf child instances.
+Karaf instance allows you to manage Karaf child instances.
You can create new Karaf instances, configure attributes, rename instances, stop instances, etc.
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start Mon Feb 20 10:14:50 2012
@@ -21,5 +21,5 @@
KARAF_HOME=${SUBST-KARAF-HOME}
KARAF_NAME=${SUBST-KARAF-NAME}
-exec ${KARAF_HOME}/bin/admin start ${KARAF_NAME} "$@"
+exec ${KARAF_HOME}/bin/instance start ${KARAF_NAME} "$@"
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat Mon Feb 20 10:14:50 2012
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\admin.bat start %KARAF_NAME%
+%KARAF_HOME%\bin\instance.bat start %KARAF_NAME%
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop Mon Feb 20 10:14:50 2012
@@ -21,5 +21,5 @@
KARAF_HOME=${SUBST-KARAF-HOME}
KARAF_NAME=${SUBST-KARAF-NAME}
-exec ${KARAF_HOME}/bin/admin stop ${KARAF_NAME} "$@"
+exec ${KARAF_HOME}/bin/instance stop ${KARAF_NAME} "$@"
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat Mon Feb 20 10:14:50 2012
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\admin.bat stop %KARAF_NAME%
+%KARAF_HOME%\bin\instance.bat stop %KARAF_NAME%
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs (from r1291022, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs?p2=karaf/trunk/instance/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/InstanceSettingsTest.java (from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/InstanceSettingsTest.java?p2=karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/InstanceSettingsTest.java&p1=karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java (original)
+++ karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/InstanceSettingsTest.java Mon Feb 20 10:14:50 2012
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin;
+package org.apache.karaf.instance;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import junit.framework.TestCase;
-import org.apache.karaf.admin.InstanceSettings;
import org.junit.Assert;
public class InstanceSettingsTest extends TestCase {
Copied: karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java (from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java?p2=karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java&p1=karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java (original)
+++ karaf/trunk/instance/core/src/test/java/org/apache/karaf/instance/internal/InstanceServiceImplTest.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.internal;
+package org.apache.karaf.instance.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -26,13 +26,13 @@ import java.util.Arrays;
import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.karaf.admin.Instance;
-import org.apache.karaf.admin.InstanceSettings;
+import org.apache.karaf.instance.Instance;
+import org.apache.karaf.instance.InstanceSettings;
-public class AdminServiceImplTest extends TestCase {
+public class InstanceServiceImplTest extends TestCase {
public void testHandleFeatures() throws Exception {
- AdminServiceImpl as = new AdminServiceImpl();
+ InstanceServiceImpl as = new InstanceServiceImpl();
File f = File.createTempFile(getName(), ".test");
try {
@@ -65,11 +65,11 @@ public class AdminServiceImplTest extend
}
/**
- * Ensure the admin:create generates all the required configuration files
+ * Ensure the instance:create generates all the required configuration files
* //TODO: fix this test so it can run in an IDE
*/
public void testConfigurationFiles() throws Exception {
- AdminServiceImpl service = new AdminServiceImpl();
+ InstanceServiceImpl service = new InstanceServiceImpl();
service.setStorageLocation(new File("target/instances/" + System.currentTimeMillis()));
System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
@@ -96,7 +96,7 @@ public class AdminServiceImplTest extend
* </p>
*/
public void testRenameInstance() throws Exception {
- AdminServiceImpl service = new AdminServiceImpl();
+ InstanceServiceImpl service = new InstanceServiceImpl();
service.setStorageLocation(new File("target/instances/" + System.currentTimeMillis()));
System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
Copied: karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/MainTest.java (from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/MainTest.java?p2=karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/MainTest.java&p1=karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java (from r1291022, karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java?p2=karaf/trunk/instance/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java&p1=karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/core/src/test/resources/etc/startup.properties (from r1291022, karaf/trunk/admin/core/src/test/resources/etc/startup.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/test/resources/etc/startup.properties?p2=karaf/trunk/instance/core/src/test/resources/etc/startup.properties&p1=karaf/trunk/admin/core/src/test/resources/etc/startup.properties&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/management/NOTICE (from r1291022, karaf/trunk/admin/management/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/NOTICE?p2=karaf/trunk/instance/management/NOTICE&p1=karaf/trunk/admin/management/NOTICE&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/instance/management/pom.xml (from r1291022, karaf/trunk/admin/management/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/pom.xml?p2=karaf/trunk/instance/management/pom.xml&p1=karaf/trunk/admin/management/pom.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/instance/management/pom.xml Mon Feb 20 10:14:50 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>admin</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>instance</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.admin.management</artifactId>
+ <artifactId>org.apache.karaf.instance.management</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Admin :: Management</name>
- <description>Provide JMX MBeans related to the Karaf admin feature.</description>
+ <name>Apache Karaf :: Instance :: Management</name>
+ <description>Provide JMX MBeans related to the Karaf instance feature.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -51,8 +51,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
</dependency>
<dependency>
@@ -98,10 +98,11 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>org.apache.karaf.admin.management.internal</Private-Package>
+ <Private-Package>org.apache.karaf.instance.management.internal</Private-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
+
</project>
Copied: karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/InstanceServiceMBean.java (from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/InstanceServiceMBean.java?p2=karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/InstanceServiceMBean.java&p1=karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java (original)
+++ karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/InstanceServiceMBean.java Mon Feb 20 10:14:50 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.management;
+package org.apache.karaf.instance.management;
import javax.management.openmbean.TabularData;
-public interface AdminServiceMBean {
+public interface InstanceServiceMBean {
String INSTANCE_PID = "Pid";
String INSTANCE_NAME = "Name";
Copied: karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/JmxInstance.java (from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/JmxInstance.java?p2=karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/JmxInstance.java&p1=karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java (original)
+++ karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/codec/JmxInstance.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.management.codec;
+package org.apache.karaf.instance.management.codec;
import java.util.List;
@@ -28,10 +28,11 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import org.apache.karaf.admin.management.AdminServiceMBean;
-import org.apache.karaf.admin.Instance;
+import org.apache.karaf.instance.management.InstanceServiceMBean;
+import org.apache.karaf.instance.Instance;
public class JmxInstance {
+
static final CompositeType INSTANCE;
static final TabularType INSTANCE_TABLE;
@@ -48,7 +49,7 @@ public class JmxInstance {
public JmxInstance(Instance instance) {
try {
- String[] itemNames = AdminServiceMBean.INSTANCE;
+ String[] itemNames = InstanceServiceMBean.INSTANCE;
Object[] itemValues = new Object[itemNames.length];
itemValues[0] = instance.getPid();
itemValues[1] = instance.getName();
@@ -73,7 +74,7 @@ public class JmxInstance {
private static CompositeType createInstanceType() {
try {
String desc = "This type describes Karaf instances";
- String[] itemNames = AdminServiceMBean.INSTANCE;
+ String[] itemNames = InstanceServiceMBean.INSTANCE;
OpenType[] itemTypes = new OpenType[itemNames.length];
String[] descriptions = new String[itemNames.length];
@@ -113,7 +114,7 @@ public class JmxInstance {
private static TabularType createInstanceTableType() {
try {
return new TabularType("Instances", "Table of all Karaf instances", INSTANCE,
- new String[] {AdminServiceMBean.INSTANCE_NAME});
+ new String[] {InstanceServiceMBean.INSTANCE_NAME});
} catch (OpenDataException e) {
throw new IllegalStateException("Unable to build instance table type", e);
}
Copied: karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java (from r1291022, karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java?p2=karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java&p1=karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java (original)
+++ karaf/trunk/instance/management/src/main/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImpl.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.management.internal;
+package org.apache.karaf.instance.management.internal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,26 +24,26 @@ import javax.management.NotCompliantMBea
import javax.management.StandardMBean;
import javax.management.openmbean.TabularData;
-import org.apache.karaf.admin.management.AdminServiceMBean;
-import org.apache.karaf.admin.AdminService;
-import org.apache.karaf.admin.Instance;
-import org.apache.karaf.admin.InstanceSettings;
-import org.apache.karaf.admin.management.codec.JmxInstance;
+import org.apache.karaf.instance.management.InstanceServiceMBean;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.Instance;
+import org.apache.karaf.instance.InstanceSettings;
+import org.apache.karaf.instance.management.codec.JmxInstance;
-public class AdminServiceMBeanImpl extends StandardMBean implements AdminServiceMBean {
+public class InstanceServiceMBeanImpl extends StandardMBean implements InstanceServiceMBean {
- private AdminService adminService;
+ private InstanceService instanceService;
- public AdminServiceMBeanImpl() throws NotCompliantMBeanException {
- super(AdminServiceMBean.class);
+ public InstanceServiceMBeanImpl() throws NotCompliantMBeanException {
+ super(InstanceServiceMBean.class);
}
- public AdminService getAdminService() {
- return adminService;
+ public InstanceService getInstanceService() {
+ return instanceService;
}
- public void setAdminService(AdminService adminService) {
- this.adminService = adminService;
+ public void setInstanceService(InstanceService instanceService) {
+ this.instanceService = instanceService;
}
public int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts, String features, String featureURLs)
@@ -58,7 +58,7 @@ public class AdminServiceMBeanImpl exten
InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts,
parseStringList(featureURLs), parseStringList(features));
- Instance inst = adminService.createInstance(name, settings);
+ Instance inst = instanceService.createInstance(name, settings);
if (inst != null) {
return inst.getPid();
} else {
@@ -95,11 +95,11 @@ public class AdminServiceMBeanImpl exten
}
public void renameInstance(String originalName, String newName) throws Exception {
- adminService.renameInstance(originalName, newName);
+ instanceService.renameInstance(originalName, newName);
}
public TabularData getInstances() throws Exception {
- List<Instance> allInstances = Arrays.asList(adminService.getInstances());
+ List<Instance> allInstances = Arrays.asList(instanceService.getInstances());
List<JmxInstance> instances = new ArrayList<JmxInstance>();
for (Instance instance : allInstances) {
instances.add(new JmxInstance(instance));
@@ -109,7 +109,7 @@ public class AdminServiceMBeanImpl exten
}
private Instance getExistingInstance(String name) {
- Instance i = adminService.getInstance(name);
+ Instance i = instanceService.getInstance(name);
if (i == null) {
throw new IllegalArgumentException("Instance '" + name + "' does not exist");
}
Copied: karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/instance-management.xml (from r1291022, karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/instance-management.xml?p2=karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/instance-management.xml&p1=karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml (original)
+++ karaf/trunk/instance/management/src/main/resources/OSGI-INF/blueprint/instance-management.xml Mon Feb 20 10:14:50 2012
@@ -19,21 +19,20 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="eager">
- <reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
+ <reference id="instanceService" interface="org.apache.karaf.instance.InstanceService" />
<reference id="mbeanServer" interface="javax.management.MBeanServer">
<reference-listener ref="mbeanRegister" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer" />
</reference>
- <bean id="mbeanImpl" class="org.apache.karaf.admin.management.internal.AdminServiceMBeanImpl">
- <property name="adminService" ref="adminService" />
+ <bean id="mbeanImpl" class="org.apache.karaf.instance.management.internal.InstanceServiceMBeanImpl">
+ <property name="instanceService" ref="instanceService" />
</bean>
<bean id="mbeanRegister" class="org.apache.karaf.management.MBeanRegistrer">
<property name="mbeans">
<map>
- <entry value="org.apache.karaf:type=admin,name=${karaf.name}"
- key-ref="mbeanImpl" />
+ <entry value="org.apache.karaf:type=instance,name=${karaf.name}" key-ref="mbeanImpl" />
</map>
</property>
</bean>
Copied: karaf/trunk/instance/management/src/main/resources/OSGI-INF/bundle.info (from r1291022, karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/main/resources/OSGI-INF/bundle.info?p2=karaf/trunk/instance/management/src/main/resources/OSGI-INF/bundle.info&p1=karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/bundle.info (original)
+++ karaf/trunk/instance/management/src/main/resources/OSGI-INF/bundle.info Mon Feb 20 10:14:50 2012
@@ -9,12 +9,12 @@ Maven URL:
h1. Description
-This bundle provides JMX MBeans related to the Karaf admin feature.
+This bundle provides JMX MBeans related to the Karaf instance feature.
-In particular, an AdminServiceMBean is provided that can be remotely administered using a JMX client (for instance
+In particular, an InstanceServiceMBean is provided that can be remotely administered using a JMX client (for instance
JConsole).
-With this AdminServiceMBean, you have the following operations available:
+With this InstanceServiceMBean, you have the following operations available:
* createInstance(name, sshPort, rmiPort, location, javaOpts, features, featureURLs) - Creates a new Karaf instance.
* changeSshPort(name, port) - Changes the SSH port number of an existing Karaf instance.
* changeRmiRegistryPort(name, port) - Changes the RMI registry port number of an existing Karaf instance.
Copied: karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/JmxInstanceTest.java (from r1291022, karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/JmxInstanceTest.java?p2=karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/JmxInstanceTest.java&p1=karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java (original)
+++ karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/codec/JmxInstanceTest.java Mon Feb 20 10:14:50 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.admin.management.codec;
+package org.apache.karaf.instance.management.codec;
import java.util.Arrays;
import java.util.Collection;
@@ -27,8 +27,8 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularType;
import junit.framework.TestCase;
-import org.apache.karaf.admin.Instance;
-import org.apache.karaf.admin.management.AdminServiceMBean;
+import org.apache.karaf.instance.Instance;
+import org.apache.karaf.instance.management.InstanceServiceMBean;
import org.easymock.EasyMock;
import org.junit.Assert;
@@ -36,7 +36,7 @@ public class JmxInstanceTest extends Tes
public void testJMXInstanceStatics() {
CompositeType it = JmxInstance.INSTANCE;
Assert.assertEquals(
- new HashSet<String>(Arrays.asList(AdminServiceMBean.INSTANCE)),
+ new HashSet<String>(Arrays.asList(InstanceServiceMBean.INSTANCE)),
it.keySet());
TabularType tt = JmxInstance.INSTANCE_TABLE;
Added: 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=1291178&view=auto
==============================================================================
--- karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java (added)
+++ karaf/trunk/instance/management/src/test/java/org/apache/karaf/instance/management/internal/InstanceServiceMBeanImplTest.java Mon Feb 20 10:14:50 2012
@@ -0,0 +1,260 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.instance.management.internal;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.TabularData;
+
+import junit.framework.TestCase;
+import org.apache.karaf.instance.InstanceService;
+import org.apache.karaf.instance.Instance;
+import org.apache.karaf.instance.InstanceSettings;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+
+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"));
+
+ final Instance inst = EasyMock.createMock(Instance.class);
+ EasyMock.expect(inst.getPid()).andReturn(42);
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.createInstance("t1", instanceSettings)).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl ab = new InstanceServiceMBeanImpl();
+ ab.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, ab.getInstanceService());
+
+ assertEquals(42, ab.createInstance("t1", 123, 456, 789, "somewhere", "someopts", " webconsole, funfeat", ""));
+ }
+
+ public void testCreateInstance2() throws Exception {
+ final InstanceSettings instanceSettings = new InstanceSettings(0, 0, 0, null, null,
+ Collections.<String>emptyList(), Collections.<String>emptyList());
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.createInstance("t1", instanceSettings)).andReturn(null);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl ab = new InstanceServiceMBeanImpl();
+ ab.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, ab.getInstanceService());
+
+ assertEquals(-1, ab.createInstance("t1", 0, 0, 0, "", "", "", ""));
+ }
+
+ public void testGetInstances() throws Exception {
+ Instance i1 = EasyMock.createMock(Instance.class);
+ EasyMock.expect(i1.getPid()).andReturn(1234);
+ EasyMock.expect(i1.getSshPort()).andReturn(8818);
+ EasyMock.expect(i1.getRmiRegistryPort()).andReturn(1122);
+ EasyMock.expect(i1.getRmiServerPort()).andReturn(44444);
+ EasyMock.expect(i1.getName()).andReturn("i1");
+ EasyMock.expect(i1.isRoot()).andReturn(true);
+ EasyMock.expect(i1.getLocation()).andReturn("somewhere");
+ EasyMock.expect(i1.getJavaOpts()).andReturn("someopts");
+ EasyMock.expect(i1.getState()).andReturn("Stopped");
+ EasyMock.replay(i1);
+ Instance i2 = EasyMock.createNiceMock(Instance.class);
+ EasyMock.expect(i2.getName()).andReturn("i2");
+ EasyMock.replay(i2);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstances()).andReturn(new Instance[]{i1, i2});
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+
+ TabularData tabularData = instanceServiceMBean.getInstances();
+ Assert.assertEquals(2, tabularData.size());
+ CompositeData cd1 = tabularData.get(new Object[]{"i1"});
+ Assert.assertTrue(cd1.containsValue("i1"));
+ Assert.assertTrue(cd1.containsValue(true));
+ Assert.assertTrue(cd1.containsValue(1234));
+ Assert.assertTrue(cd1.containsValue(8818));
+ Assert.assertTrue(cd1.containsValue(1122));
+ Assert.assertTrue(cd1.containsValue(44444));
+ Assert.assertTrue(cd1.containsValue("somewhere"));
+ Assert.assertTrue(cd1.containsValue("someopts"));
+ Assert.assertTrue(cd1.containsValue("Stopped"));
+
+ CompositeData cd2 = tabularData.get(new Object [] {"i2"});
+ Assert.assertTrue(cd2.containsValue("i2"));
+ }
+
+ public void testStartInstanceWithJavaOpts() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.start("-x -y -z");
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.startInstance("test instance", "-x -y -z");
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testStartInstanceWithNoJavaOpts() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.start(null);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.startInstance("test instance", null);
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testStopInstance() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.stop();
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.stopInstance("test instance");
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testDestroyInstance() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.destroy();
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.destroyInstance("test instance");
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testSshChangePort() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.changeSshPort(7788);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.changeSshPort("test instance", 7788);
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testRmiRegistryChangePort() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.changeRmiRegistryPort(1123);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.changeRmiRegistryPort("test instance", 1123);
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testRmiServerChangePort() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.changeRmiServerPort(44444);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.changeRmiServerPort("test instance", 44444);
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+ public void testChangeOptions() throws Exception {
+ Instance inst = EasyMock.createMock(Instance.class);
+ inst.changeJavaOpts("new opts");
+ EasyMock.expectLastCall();
+ EasyMock.replay(inst);
+
+ InstanceService instanceService = EasyMock.createMock(InstanceService.class);
+ EasyMock.expect(instanceService.getInstance("test instance")).andReturn(inst);
+ EasyMock.replay(instanceService);
+
+ InstanceServiceMBeanImpl instanceServiceMBean = new InstanceServiceMBeanImpl();
+ instanceServiceMBean.setInstanceService(instanceService);
+ Assert.assertSame(instanceService, instanceServiceMBean.getInstanceService());
+
+ instanceServiceMBean.changeJavaOpts("test instance", "new opts");
+ EasyMock.verify(instanceService);
+ EasyMock.verify(inst);
+ }
+
+}
Copied: karaf/trunk/instance/pom.xml (from r1291022, karaf/trunk/admin/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/pom.xml?p2=karaf/trunk/instance/pom.xml&p1=karaf/trunk/admin/pom.xml&r1=1291022&r2=1291178&rev=1291178&view=diff
==============================================================================
--- karaf/trunk/admin/pom.xml (original)
+++ karaf/trunk/instance/pom.xml Mon Feb 20 10:14:50 2012
@@ -28,10 +28,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>admin</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>instance</artifactId>
<packaging>pom</packaging>
- <name>Apache Karaf :: Admin</name>
+ <name>Apache Karaf :: Instance</name>
<modules>
<module>core</module>
Modified: karaf/trunk/itests/kittests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/kittests/pom.xml?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/itests/kittests/pom.xml (original)
+++ karaf/trunk/itests/kittests/pom.xml Mon Feb 20 10:14:50 2012
@@ -65,8 +65,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
<scope>test</scope>
</dependency>
Modified: karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml (original)
+++ karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml Mon Feb 20 10:14:50 2012
@@ -21,7 +21,7 @@
<reference-listener ref="mbeanRegistrer" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
</reference>
- <!-- Reference to the configuration admin -->
+ <!-- Reference to the configuration instance -->
<reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
<!-- Config MBean -->
Modified: karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java (original)
+++ karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java Mon Feb 20 10:14:50 2012
@@ -31,9 +31,9 @@ public class MBeanRegistererTest extends
public void testRegistration() throws Exception {
IMocksControl control = createNiceControl();
MBeanServer mbeanServer = control.createMock(MBeanServer.class);
- String rawName = "org.apache.karaf:type=admin,name=${karaf.name}";
+ String rawName = "org.apache.karaf:type=instance,name=${karaf.name}";
AdminServiceMBean mbean = control.createMock(AdminServiceMBean.class);
- ObjectName name = new ObjectName("org.apache.karaf:type=admin,name=foobar");
+ ObjectName name = new ObjectName("org.apache.karaf:type=instance,name=foobar");
expect(mbeanServer.registerMBean(isA(AdminServiceMBean.class), eq(name))).andReturn(null);
mbeanServer.unregisterMBean(eq(name));
expectLastCall();
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Mon Feb 20 10:14:50 2012
@@ -262,8 +262,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.command</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.command</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Feb 20 10:14:50 2012
@@ -40,7 +40,7 @@
<module>features</module>
<module>kar</module>
<module>region</module>
- <module>admin</module>
+ <module>instance</module>
<module>deployer</module>
<module>shell</module>
<module>jaas</module>
@@ -445,18 +445,18 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.command</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.command</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.management</artifactId>
+ <groupId>org.apache.karaf.instance</groupId>
+ <artifactId>org.apache.karaf.instance.management</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: karaf/trunk/region/commands/src/main/java/org/apache/karaf/region/commands/RegionCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/commands/src/main/java/org/apache/karaf/region/commands/RegionCommandSupport.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/region/commands/src/main/java/org/apache/karaf/region/commands/RegionCommandSupport.java (original)
+++ karaf/trunk/region/commands/src/main/java/org/apache/karaf/region/commands/RegionCommandSupport.java Mon Feb 20 10:14:50 2012
@@ -29,7 +29,7 @@ public abstract class RegionCommandSuppo
protected static final char VERSION_DELIM = ',';
protected Object doExecute() throws Exception {
- // Get repository admin service.
+ // Get repository instance service.
ServiceReference ref = getBundleContext().getServiceReference(RegionDigraph.class.getName());
if (ref == null) {
System.out.println("RegionDigraph service is unavailable.");
Modified: karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/BlueprintListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/BlueprintListener.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/BlueprintListener.java (original)
+++ karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/BlueprintListener.java Mon Feb 20 10:14:50 2012
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
/**
*
- * TODO: use event admin to receive WAIT topics notifications from blueprint extender
+ * TODO: use event instance to receive WAIT topics notifications from blueprint extender
*
*/
public class BlueprintListener implements org.osgi.service.blueprint.container.BlueprintListener, BundleListener,
Modified: karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/StartLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/StartLevel.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/StartLevel.java (original)
+++ karaf/trunk/shell/bundles/src/main/java/org/apache/karaf/shell/bundles/StartLevel.java Mon Feb 20 10:14:50 2012
@@ -28,7 +28,7 @@ public class StartLevel extends BundleCo
Integer level;
protected void doExecute(Bundle bundle) throws Exception {
- // Get package admin service.
+ // Get package instance service.
BundleStartLevel bsl = bundle.adapt(BundleStartLevel.class);
if (bsl == null) {
System.out.println("StartLevel service is unavailable.");
Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java Mon Feb 20 10:14:50 2012
@@ -33,7 +33,7 @@ import org.osgi.service.cm.Configuration
/**
* {@link jline.Completor} for Configuration Admin configurations.
*
- * Displays a list of existing config admin configurations for completion.
+ * Displays a list of existing config instance configurations for completion.
*
*/
public class ConfigurationCompleter implements Completer, ConfigurationListener {
Modified: karaf/trunk/shell/dev/src/main/resources/org/apache/karaf/shell/dev/framework/equinox-debug.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/resources/org/apache/karaf/shell/dev/framework/equinox-debug.properties?rev=1291178&r1=1291177&r2=1291178&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/resources/org/apache/karaf/shell/dev/framework/equinox-debug.properties (original)
+++ karaf/trunk/shell/dev/src/main/resources/org/apache/karaf/shell/dev/framework/equinox-debug.properties Mon Feb 20 10:14:50 2012
@@ -32,7 +32,7 @@ org.eclipse.osgi/debug/filter=false
org.eclipse.osgi/debug/security=false
# Prints out start level service debug information
org.eclipse.osgi/debug/startlevel=false
-# Prints out package admin service debug information
+# Prints out package instance service debug information
org.eclipse.osgi/debug/packageadmin=false
# Prints out timing information for bundle activation
org.eclipse.osgi/debug/bundleTime=false