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/06/19 11:01:17 UTC
svn commit: r1351611 - in /karaf/branches/karaf-2.3.x/admin:
command/src/main/java/org/apache/karaf/admin/command/
command/src/main/resources/OSGI-INF/blueprint/
core/src/main/java/org/apache/karaf/admin/
core/src/main/java/org/apache/karaf/admin/inter...
Author: jbonofre
Date: Tue Jun 19 09:01:16 2012
New Revision: 1351611
URL: http://svn.apache.org/viewvc?rev=1351611&view=rev
Log:
[KARAF-1557] Add admin:clone command, service and MBean operation
Added:
karaf/branches/karaf-2.3.x/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java
Modified:
karaf/branches/karaf-2.3.x/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java
karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
Added: karaf/branches/karaf-2.3.x/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java?rev=1351611&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java (added)
+++ karaf/branches/karaf-2.3.x/admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java Tue Jun 19 09:01:16 2012
@@ -0,0 +1,61 @@
+/*
+ * 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.admin.command;
+
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.karaf.admin.InstanceSettings;
+
+/**
+ * Clone an existing instance.
+ */
+@Command(scope = "instance", name = "clone", description = "Clones an existing container instance.")
+public class CloneCommand extends AdminCommandSupport {
+
+ @Option(name = "-s", aliases = {"--ssh-port"}, description = "Port number for remote secure shell connection", required = false, multiValued = false)
+ int sshPort = 0;
+
+ @Option(name = "-r", aliases = {"-rr", "--rmi-port", "--rmi-registry-port"}, description = "Port number for RMI registry connection", required = false, multiValued = false)
+ int rmiRegistryPort = 0;
+
+ @Option(name = "-rs", aliases = {"--rmi-server-port"}, description = "Port number for RMI server connection", required = false, multiValued = false)
+ int rmiServerPort = 0;
+
+ @Option(name = "-l", aliases = {"--location"}, description = "Location of the cloned container instance in the file system", required = false, multiValued = false)
+ String location;
+
+ @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);
+ getAdminService().cloneInstance(name, cloneName, settings);
+ return null;
+ }
+
+}
Modified: karaf/branches/karaf-2.3.x/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml?rev=1351611&r1=1351610&r2=1351611&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml Tue Jun 19 09:01:16 2012
@@ -80,6 +80,15 @@
<null />
</completers>
</command>
+ <command name="admin/clone">
+ <action class="org.apache.karaf.admin.command.CloneCommand">
+ <property name="adminService" ref="adminService" />
+ </action>
+ <completers>
+ <ref component-id="instanceCompleter" />
+ <null />
+ </completers>
+ </command>
<command name="admin/change-ssh-port">
<action class="org.apache.karaf.admin.command.ChangeSshPortCommand">
<property name="adminService" ref="adminService" />
Modified: karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java?rev=1351611&r1=1351610&r2=1351611&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java (original)
+++ karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/AdminService.java Tue Jun 19 09:01:16 2012
@@ -22,6 +22,8 @@ public interface AdminService {
void renameInstance(String name, String newName) throws Exception;
+ Instance cloneInstance(String name, String cloneName, InstanceSettings settings) throws Exception;
+
Instance[] getInstances();
Instance getInstance(String name);
Modified: karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java?rev=1351611&r1=1351610&r2=1351611&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java (original)
+++ karaf/branches/karaf-2.3.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java Tue Jun 19 09:01:16 2012
@@ -37,6 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdminServiceImpl implements AdminService {
+
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";
@@ -303,6 +304,64 @@ public class AdminServiceImpl implements
saveState();
}
+ public synchronized Instance cloneInstance(String name, String cloneName, InstanceSettings settings) throws Exception {
+ if (instances.get(cloneName) != null) {
+ throw new IllegalArgumentException("Instance " + cloneName + " already exists");
+ }
+ Instance instance = instances.get(name);
+ if (instance == null) {
+ throw new IllegalArgumentException("Instance " + name + " not found");
+ }
+ if (instance.isRoot()) {
+ throw new IllegalArgumentException("Root instance cannot be cloned");
+ }
+ if (instance.getPid() != 0) {
+ throw new IllegalArgumentException("Instance not stopped");
+ }
+
+ // define the clone instance location
+ String cloneLocationPath = settings.getLocation() != null ? settings.getLocation() : name;
+ File cloneLocation = new File(cloneLocationPath);
+ if (!cloneLocation.isAbsolute()) {
+ cloneLocation = new File(storageLocation, cloneLocationPath);
+ }
+ // copy instance directory
+ String locationPath = instance.getLocation();
+ File location = new File(locationPath);
+ copy(location, cloneLocation);
+ // create the properties map including the instance name, location, ssh and rmi port numbers
+ HashMap<String, String> props = new HashMap<String, String>();
+ props.put(name, cloneName);
+ props.put(locationPath, cloneLocationPath);
+ if (settings.getSshPort() > 0)
+ props.put(new Integer(instance.getSshPort()).toString(), new Integer(settings.getSshPort()).toString());
+ if (settings.getRmiRegistryPort() > 0)
+ props.put(new Integer(instance.getRmiRegistryPort()).toString(), new Integer(settings.getRmiRegistryPort()).toString());
+ if (settings.getRmiServerPort() > 0)
+ props.put(new Integer(instance.getRmiServerPort()).toString(), new Integer(settings.getRmiServerPort()).toString());
+ // filtering clone files
+ filterResource(cloneLocation, "etc/customer.properties", props);
+ filterResource(cloneLocation, "etc/org.apache.karaf.management.cfg", props);
+ filterResource(cloneLocation, "etc/org.apache.karaf.shell.cfg", props);
+ filterResource(cloneLocation, "etc/org.ops4j.pax.logging.cfg", props);
+ filterResource(cloneLocation, "etc/system.properties", props);
+ filterResource(cloneLocation, "bin/karaf", props);
+ filterResource(cloneLocation, "bin/start", props);
+ filterResource(cloneLocation, "bin/stop", props);
+ filterResource(cloneLocation, "bin/karaf.bat", props);
+ filterResource(cloneLocation, "bin/start.bat", props);
+ filterResource(cloneLocation, "bin/stop.bat", props);
+ // create and add the clone instance in the registry
+ String javaOpts = settings.getJavaOpts();
+ if (javaOpts == null || javaOpts.length() == 0) {
+ javaOpts = "-server -Xmx512M -Dcom.sun.management.jmxremote";
+ }
+ Instance cloneInstance = new InstanceImpl(this, name, cloneLocation.toString(), settings.getJavaOpts());
+ instances.put(name, instance);
+ saveState();
+ return cloneInstance;
+ }
+
synchronized void saveState() throws IOException {
Properties storage = new Properties();
Instance[] data = getInstances();
@@ -459,4 +518,26 @@ public class AdminServiceImpl implements
return status;
}
+ private void copy(File source, File destination) throws Exception {
+ if (source.isDirectory()) {
+ if (!destination.exists()) {
+ destination.mkdirs();
+ }
+ String[] children = source.list();
+ for (String child : children) {
+ copy(new File(source, child), new File(destination, child));
+ }
+ } else {
+ InputStream in = new FileInputStream(source);
+ OutputStream out = new FileOutputStream(destination);
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = in.read(buffer)) > 0) {
+ out.write(buffer, 0, length);
+ }
+ in.close();
+ out.close();
+ }
+ }
+
}
Modified: karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java?rev=1351611&r1=1351610&r2=1351611&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java (original)
+++ karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java Tue Jun 19 09:01:16 2012
@@ -43,6 +43,7 @@ public interface AdminServiceMBean {
void startInstance(String name, String opts) throws Exception;
void stopInstance(String name) throws Exception;
void renameInstance(String originalName, String newName) throws Exception;
+ void cloneInstance(String name, String cloneName, int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts) throws Exception;
// Attributes
TabularData getInstances() throws Exception;
Modified: karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java?rev=1351611&r1=1351610&r2=1351611&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java (original)
+++ karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java Tue Jun 19 09:01:16 2012
@@ -98,6 +98,18 @@ public class AdminServiceMBeanImpl exten
adminService.renameInstance(originalName, newName);
}
+ public void cloneInstance(String name, String cloneName, int sshPort, int rmiRegistryPort, int rmiServerPort, String location, String javaOpts) throws Exception {
+ if ("".equals(location)) {
+ location = null;
+ }
+ if ("".equals(javaOpts)) {
+ javaOpts = null;
+ }
+
+ InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, null, null);
+ adminService.cloneInstance(name, cloneName, settings);
+ }
+
public TabularData getInstances() throws Exception {
List<Instance> allInstances = Arrays.asList(adminService.getInstances());
List<JmxInstance> instances = new ArrayList<JmxInstance>();