diff -r 077ebe3d0d24 -r f1d133b09a8c components/visual-panels/apache/src/java/vpanels/app/apache/com/oracle/solaris/vp/panels/apache/client/swing/Modules.java
--- a/components/visual-panels/apache/src/java/vpanels/app/apache/com/oracle/solaris/vp/panels/apache/client/swing/Modules.java	Tue Dec 16 05:53:51 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- */
-
-package com.oracle.solaris.vp.panels.apache.client.swing;
-
-import java.util.*;
-import javax.swing.Icon;
-import com.oracle.solaris.scf.common.ScfException;
-import com.oracle.solaris.vp.panel.common.model.*;
-import com.oracle.solaris.vp.panel.common.smf.*;
-import com.oracle.solaris.vp.util.misc.*;
-import com.oracle.solaris.vp.util.misc.finder.Finder;
-import com.oracle.solaris.vp.util.misc.property.*;
-import com.oracle.solaris.vp.util.swing.HasIcon;
-
-@SuppressWarnings({"serial"})
-public class Modules extends AbstractManagedObject<Module>
-    implements HasIcon {
-
-    //
-    // Static data
-    //
-
-    public static final String ID = "modules";
-    public static final String NAME = Finder.getString("modules.title");
-    public static final String PROPERTY_ADDED = "added Modules";
-    public static final String PROPERTY_REMOVED = "removed Modules";
-
-    //
-    // Instance data
-    //
-
-    private ApacheInfo info;
-    private SimpleHasId tmpHasId = new SimpleHasId();
-
-    private BasicMutableProperty<Integer> addedProperty =
-	new IntegerProperty(PROPERTY_ADDED);
-
-    private BasicMutableProperty<Integer> removedProperty =
-	new IntegerProperty(PROPERTY_REMOVED);
-
-    private List<Module> removed = new ArrayList<Module>();
-
-    //
-    // Constructors
-    //
-
-    public Modules(ApacheInfo info) {
-	super(ID);
-	this.info = info;
-
-	addedProperty.update(0, true);
-	addProperties(addedProperty);
-
-	removedProperty.update(0, true);
-	addProperties(removedProperty);
-
-	setComparator(SimpleHasId.COMPARATOR);
-    }
-
-    //
-    // HasIcon methods
-    //
-
-    @Override
-    public Icon getIcon(int height) {
-	return IconUtil.getClosestIcon(Module.icons, height);
-    }
-
-    //
-    // ManagedObject methods
-    //
-
-    @Override
-    public String getName() {
-	return NAME;
-    }
-
-    //
-    // AbstractManagedObject methods
-    //
-
-    @Override
-    public void addChildren(Module... toAdd) {
-	super.addChildren(toAdd);
-
-	ChangeableAggregator aggregator = getChangeableAggregator();
-	for (Module module : toAdd) {
-	    if (!module.isInRepo()) {
-		addedProperty.setValue(addedProperty.getValue() + 1);
-	    }
-	    aggregator.addChangeables(module.getChangeableAggregator());
-	}
-    }
-
-    @Override
-    public void removeChildren(Module... toRemove) {
-	super.removeChildren(toRemove);
-
-	ChangeableAggregator aggregator = getChangeableAggregator();
-	for (Module module : toRemove) {
-	    if (!module.isInRepo()) {
-		addedProperty.setValue(addedProperty.getValue() - 1);
-	    }
-	    aggregator.removeChangeable(module.getChangeableAggregator());
-	}
-    }
-
-    //
-    // Modules methods
-    //
-
-    public ApacheInfo getApacheInfo() {
-	return info;
-    }
-
-    public Module getModule(String id) {
-	synchronized (children) {
-	    tmpHasId.setId(id);
-	    int index = Collections.binarySearch(
-		getChildren(), tmpHasId, SimpleHasId.COMPARATOR);
-
-	    if (index >= 0) {
-		return children.get(index);
-	    }
-
-	    return null;
-	}
-    }
-
-    public void refresh(boolean force) throws ScfException {
-	ServiceBean service = info.getPanelDescriptor().getService();
-	String group = info.getPropertyGroupName();
-
-	// Build list of names of Module properties
-	List<String> properties = new ArrayList<String>();
-	for (String property : service.getPropertyNames(group)) {
-	    if (property.startsWith(Module.SMF_PROPERTY_PREFIX)) {
-		properties.add(property);
-	    }
-	}
-	Collections.sort(properties);
-
-	// Remove names of properties that are pending removal on client
-	for (Iterator<Module> i = removed.iterator(); i.hasNext(); ) {
-	    Module module = i.next();
-	    String property = module.getPropertyName();
-	    if (properties.remove(property)) {
-		// Pending removal on client, still exists on server
-	    } else {
-		// Pending removal on client, but already removed on server
-		i.remove();
-		int n = removed.size();
-		assert n == removedProperty.getValue() - 1;
-		removedProperty.setValue(n);
-	    }
-	}
-
-	// Remove names of properties already created on the client
-	List<Module> children = new ArrayList<Module>(getChildren());
-	for (Module module : children) {
-	    if (module.isInRepo()) {
-		String property = module.getPropertyName();
-		if (properties.remove(property)) {
-		    // Exists on server, already exists on client
-		    module.refresh(force);
-		} else {
-		    // Deleted on server, now must be deleted on client
-		    removeChildren(module);
-		}
-	    }
-	}
-
-	// The list now contains only properties that have been created on the
-	// server but don't yet exist on the client
-	for (String property : properties) {
-	    Module module = new Module(this, property);
-	    addChildren(module);
-	}
-    }
-
-    public void scheduleRemove(Module... modules) {
-	for (Module module : modules) {
-	    if (getChildren().contains(module)) {
-		removeChildren(module);
-
-		if (module.isInRepo()) {
-		    removed.add(module);
-		    int n = removed.size();
-		    assert n == removedProperty.getValue() + 1;
-		    removedProperty.setValue(n);
-		}
-	    }
-	}
-    }
-
-    public void saveToRepo() throws ScfException {
-	ApacheUtil.saveToRepo(info.getService(),
-	    new ScfRunnable() {
-		@Override
-		public void run() throws ScfException {
-		    for (Module module : getChildren()) {
-			module.saveToRepo();
-		    }
-		    addedProperty.setValue(0);
-
-		    for (Iterator<Module> i = removed.iterator(); i.hasNext(); )
-		    {
-			Module module = i.next();
-			module.removeFromRepo();
-			i.remove();
-			int n = removed.size();
-			assert n == removedProperty.getValue() - 1;
-			removedProperty.setValue(n);
-		    }
-
-		    for (MutableProperty<?> property : getProperties()) {
-			if (property.isChanged()) {
-			    if (property instanceof SmfMutableProperty) {
-				((SmfMutableProperty)property).saveToRepo();
-			    } else {
-				property.save();
-			    }
-			}
-		    }
-		}
-	    });
-    }
-}