Moved REST CLI into pki-tools.

The pki-client.jar has been split and merged into pki-certsrv.jar
and pki-tools.jar. The REST client classes are now packaged in
com.netscape.certsrv.<component> packages. The REST CLI classes
are now packaged in com.netscape.cmstools.<component> packages.
The "pki" script has been moved into pki-tools RPM package.

Ticket #215

42 files changed, 4 insertions, 4500 deletions

diff --git a/base/common/src/com/netscape/cms/client/ClientConfig.java b/base/common/src/com/netscape/cms/client/ClientConfig.java
deleted file mode 100644
index 7299d4d22..000000000
--- a/base/common/src/com/netscape/cms/client/ClientConfig.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author Endi S. Dewata
- */
-@XmlRootElement(name="Client")
-public class ClientConfig {
-
-    public static Marshaller marshaller;
-    public static Unmarshaller unmarshaller;
-
-    static {
-        try {
-            marshaller = JAXBContext.newInstance(ClientConfig.class).createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-            unmarshaller = JAXBContext.newInstance(ClientConfig.class).createUnmarshaller();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    URI serverURI;
-
-    String certDatabase;
-    String certNickname;
-    String username;
-    String password;
-
-    @XmlElement(name="ServerURI")
-    public URI getServerURI() {
-        return serverURI;
-    }
-
-    public void setServerURI(String serverUri) throws URISyntaxException {
-        this.serverURI = new URI(serverUri);
-    }
-
-    public void setServerURI(URI serverUri) {
-        this.serverURI = serverUri;
-    }
-
-    @XmlElement(name="CertDatabase")
-    public String getCertDatabase() {
-        return certDatabase;
-    }
-
-    public void setCertDatabase(String certDatabase) {
-        this.certDatabase = certDatabase;
-    }
-
-    @XmlElement(name="CertNickname")
-    public String getCertNickname() {
-        return certNickname;
-    }
-
-    public void setCertNickname(String certNickname) {
-        this.certNickname = certNickname;
-    }
-
-    @XmlElement(name="Username")
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @XmlElement(name="Password")
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((certDatabase == null) ? 0 : certDatabase.hashCode());
-        result = prime * result + ((certNickname == null) ? 0 : certNickname.hashCode());
-        result = prime * result + ((password == null) ? 0 : password.hashCode());
-        result = prime * result + ((serverURI == null) ? 0 : serverURI.hashCode());
-        result = prime * result + ((username == null) ? 0 : username.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ClientConfig other = (ClientConfig) obj;
-        if (certDatabase == null) {
-            if (other.certDatabase != null)
-                return false;
-        } else if (!certDatabase.equals(other.certDatabase))
-            return false;
-        if (certNickname == null) {
-            if (other.certNickname != null)
-                return false;
-        } else if (!certNickname.equals(other.certNickname))
-            return false;
-        if (password == null) {
-            if (other.password != null)
-                return false;
-        } else if (!password.equals(other.password))
-            return false;
-        if (serverURI == null) {
-            if (other.serverURI != null)
-                return false;
-        } else if (!serverURI.equals(other.serverURI))
-            return false;
-        if (username == null) {
-            if (other.username != null)
-                return false;
-        } else if (!username.equals(other.username))
-            return false;
-        return true;
-    }
-
-    public String toString() {
-        try {
-            StringWriter sw = new StringWriter();
-            marshaller.marshal(this, sw);
-            return sw.toString();
-
-        } catch (Exception e) {
-            return super.toString();
-        }
-    }
-
-    public static ClientConfig valueOf(String string) throws Exception {
-        try {
-            return (ClientConfig)unmarshaller.unmarshal(new StringReader(string));
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-
-        ClientConfig before = new ClientConfig();
-        before.setServerURI("http://localhost:9180/ca");
-        before.setCertDatabase("certs");
-        before.setCertNickname("caadmin");
-        before.setPassword("12345");
-
-        String string = before.toString();
-        System.out.println(string);
-
-        ClientConfig after = ClientConfig.valueOf(string);
-        System.out.println(before.equals(after));
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/PKIClient.java b/base/common/src/com/netscape/cms/client/PKIClient.java
deleted file mode 100644
index ddd47dab6..000000000
--- a/base/common/src/com/netscape/cms/client/PKIClient.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.netscape.cms.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.http.Header;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.ProtocolException;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.auth.params.AuthPNames;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.params.AuthPolicy;
-import org.apache.http.client.params.HttpClientParams;
-import org.apache.http.conn.scheme.LayeredSchemeSocketFactory;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeSocketFactory;
-import org.apache.http.impl.client.ClientParamsStack;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.client.EntityEnclosingRequestWrapper;
-import org.apache.http.impl.client.RequestWrapper;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
-import org.jboss.resteasy.client.ClientExecutor;
-import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.resteasy.client.ClientResponseFailure;
-import org.jboss.resteasy.client.ProxyFactory;
-import org.jboss.resteasy.client.core.BaseClientResponse;
-import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor;
-import org.jboss.resteasy.client.core.extractors.ClientErrorHandler;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.crypto.AlreadyInitializedException;
-import org.mozilla.jss.ssl.SSLCertificateApprovalCallback;
-import org.mozilla.jss.ssl.SSLSocket;
-
-
-public abstract class PKIClient {
-
-    protected boolean verbose;
-
-    protected ClientConfig config;
-
-    protected ResteasyProviderFactory providerFactory;
-    protected ClientErrorHandler errorHandler;
-    protected ClientExecutor executor;
-
-    public PKIClient(ClientConfig config) {
-        this.config = config;
-
-        DefaultHttpClient httpClient = new DefaultHttpClient();
-
-        // Register https scheme.
-        Scheme scheme = new Scheme("https", 443, new JSSProtocolSocketFactory());
-        httpClient.getConnectionManager().getSchemeRegistry().register(scheme);
-
-        if (config.getUsername() != null && config.getPassword() != null) {
-            List<String> authPref = new ArrayList<String>();
-            authPref.add(AuthPolicy.BASIC);
-            httpClient.getParams().setParameter(AuthPNames.PROXY_AUTH_PREF, authPref);
-
-            httpClient.getCredentialsProvider().setCredentials(
-                    AuthScope.ANY,
-                    new UsernamePasswordCredentials(config.getUsername(), config.getPassword()));
-        }
-
-        httpClient.addRequestInterceptor(new HttpRequestInterceptor() {
-            @Override
-            public void process(HttpRequest request, HttpContext context) throws HttpException, IOException {
-                if (verbose) {
-                    System.out.println("HTTP request: "+request.getRequestLine());
-                    for (Header header : request.getAllHeaders()) {
-                        System.out.println("  "+header.getName()+": "+header.getValue());
-                    }
-                }
-
-                // Set the request parameter to follow redirections.
-                HttpParams params = request.getParams();
-                if (params instanceof ClientParamsStack) {
-                    ClientParamsStack paramsStack = (ClientParamsStack)request.getParams();
-                    params = paramsStack.getRequestParams();
-                }
-                HttpClientParams.setRedirecting(params, true);
-            }
-        });
-
-        httpClient.addResponseInterceptor(new HttpResponseInterceptor() {
-            @Override
-            public void process(HttpResponse response, HttpContext context) throws HttpException, IOException {
-                if (verbose) {
-                    System.out.println("HTTP response: "+response.getStatusLine());
-                    for (Header header : response.getAllHeaders()) {
-                        System.out.println("  "+header.getName()+": "+header.getValue());
-                    }
-                }
-            }
-        });
-
-        httpClient.setRedirectStrategy(new DefaultRedirectStrategy() {
-            @Override
-            public HttpUriRequest getRedirect(HttpRequest request, HttpResponse response, HttpContext context)
-                    throws ProtocolException {
-
-                HttpUriRequest uriRequest = super.getRedirect(request, response, context);
-
-                URI uri = uriRequest.getURI();
-                if (verbose) System.out.println("HTTP redirect: "+uri);
-
-                // Redirect the original request to the new URI.
-                RequestWrapper wrapper;
-                if (request instanceof HttpEntityEnclosingRequest) {
-                    wrapper = new EntityEnclosingRequestWrapper((HttpEntityEnclosingRequest)request);
-                } else {
-                    wrapper = new RequestWrapper(request);
-                }
-                wrapper.setURI(uri);
-
-                return wrapper;
-            }
-
-            @Override
-            public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context)
-                    throws ProtocolException {
-
-                // The default redirection policy does not redirect POST or PUT.
-                // This overrides the policy to follow redirections for all HTTP methods.
-                return response.getStatusLine().getStatusCode() == 302;
-            }
-        });
-
-        executor = new ApacheHttpClient4Executor(httpClient);
-        providerFactory = ResteasyProviderFactory.getInstance();
-        providerFactory.addClientErrorInterceptor(new PKIErrorInterceptor());
-        errorHandler = new ClientErrorHandler(providerFactory.getClientErrorInterceptors());
-    }
-
-    private class ServerCertApprovalCB implements SSLCertificateApprovalCallback {
-
-        // Callback to approve or deny returned SSL server cert.
-        // Right now, simply approve the cert.
-        public boolean approve(org.mozilla.jss.crypto.X509Certificate serverCert,
-                SSLCertificateApprovalCallback.ValidityStatus status) {
-
-            if (verbose) System.out.println("Server certificate: "+serverCert.getSubjectDN());
-
-            SSLCertificateApprovalCallback.ValidityItem item;
-
-            Enumeration<?> errors = status.getReasons();
-            while (errors.hasMoreElements()) {
-                item = (SSLCertificateApprovalCallback.ValidityItem) errors.nextElement();
-                int reason = item.getReason();
-
-                if (reason == SSLCertificateApprovalCallback.ValidityStatus.UNTRUSTED_ISSUER ||
-                        reason == SSLCertificateApprovalCallback.ValidityStatus.BAD_CERT_DOMAIN) {
-
-                    // Allow these two since we haven't installed the CA cert for trust.
-
-                    return true;
-
-                }
-            }
-
-            // For other errors return false.
-
-            return false;
-        }
-    }
-
-    private class JSSProtocolSocketFactory implements SchemeSocketFactory, LayeredSchemeSocketFactory {
-
-        @Override
-        public Socket createSocket(HttpParams params) throws IOException {
-            return null;
-        }
-
-        @Override
-        public Socket connectSocket(Socket sock,
-                InetSocketAddress remoteAddress,
-                InetSocketAddress localAddress,
-                HttpParams params)
-                throws IOException,
-                UnknownHostException,
-                ConnectTimeoutException {
-
-            // Initialize JSS before using SSLSocket,
-            // otherwise it will throw UnsatisfiedLinkError.
-            if (config.getCertDatabase() == null) {
-                try {
-                    // No database specified, use $HOME/.pki/nssdb.
-                    File homeDir = new File(System.getProperty("user.home"));
-                    File pkiDir = new File(homeDir, ".pki");
-                    File nssdbDir = new File(pkiDir, "nssdb");
-                    nssdbDir.mkdirs();
-
-                    CryptoManager.initialize(nssdbDir.getAbsolutePath());
-
-                } catch (AlreadyInitializedException e) {
-                    // ignore
-
-                } catch (Exception e) {
-                    throw new Error(e);
-                }
-
-            } else {
-                // Database specified, already initialized by the main program.
-            }
-
-            String hostName = null;
-            int port = 0;
-            if (remoteAddress != null) {
-                hostName = remoteAddress.getHostName();
-                port = remoteAddress.getPort();
-            }
-
-            int localPort = 0;
-            InetAddress localAddr = null;
-
-            if (localAddress != null) {
-                localPort = localAddress.getPort();
-                localAddr = localAddress.getAddress();
-            }
-
-            SSLSocket socket;
-            if (sock == null) {
-                socket = new SSLSocket(InetAddress.getByName(hostName),
-                        port,
-                        localAddr,
-                        localPort,
-                        new ServerCertApprovalCB(),
-                        null);
-
-            } else {
-                socket = new SSLSocket(sock, hostName, new ServerCertApprovalCB(), null);
-            }
-
-            String certNickname = config.getCertNickname();
-            if (certNickname != null) {
-                if (verbose) System.out.println("Client certificate: "+certNickname);
-                socket.setClientCertNickname(certNickname);
-            }
-
-            return socket;
-        }
-
-        @Override
-        public boolean isSecure(Socket sock) {
-            // We only use this factory in the case of SSL Connections.
-            return true;
-        }
-
-        @Override
-        public Socket createLayeredSocket(Socket socket, String target, int port, boolean autoClose)
-                throws IOException, UnknownHostException {
-            // This method implementation is required to get SSL working.
-            return null;
-        }
-
-    }
-
-    public <T> T createProxy(Class<T> clazz) throws URISyntaxException {
-        URI uri = new URI(config.getServerURI()+"/rest");
-        return ProxyFactory.create(clazz, uri, executor, providerFactory);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T getEntity(ClientResponse<T> response) {
-        BaseClientResponse<T> clientResponse = (BaseClientResponse<T>)response;
-        try {
-            clientResponse.checkFailureStatus();
-
-       } catch (ClientResponseFailure e) {
-            errorHandler.clientErrorHandling((BaseClientResponse<T>) e.getResponse(), e);
-
-       } catch (RuntimeException e) {
-            errorHandler.clientErrorHandling(clientResponse, e);
-       }
-
-       return response.getEntity();
-    }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java b/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java
deleted file mode 100644
index 445778db4..000000000
--- a/base/common/src/com/netscape/cms/client/PKIErrorInterceptor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.resteasy.client.core.ClientErrorInterceptor;
-
-import com.netscape.certsrv.base.PKIException;
-
-public class PKIErrorInterceptor implements ClientErrorInterceptor {
-
-    public void handle(ClientResponse<?> response) {
-
-        // handle HTTP code 4xx and 5xx
-        int code = response.getResponseStatus().getStatusCode();
-        if (code < 400)
-            return;
-
-        MultivaluedMap<String, String> headers = response.getHeaders();
-        String contentType = headers.getFirst("Content-Type");
-
-        // handle XML content only
-        if (contentType == null || !contentType.startsWith(MediaType.APPLICATION_XML))
-            return;
-
-        PKIException exception;
-
-        try {
-            // Requires RESTEasy 2.3.2
-            // https://issues.jboss.org/browse/RESTEASY-652
-            PKIException.Data data = response.getEntity(PKIException.Data.class);
-
-            Class<?> clazz = Class.forName(data.className);
-            exception = (PKIException) clazz.getConstructor(PKIException.Data.class).newInstance(data);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            return;
-        }
-
-        throw exception;
-    }
-
-}
diff --git a/base/common/src/com/netscape/cms/client/ca/CAClient.java b/base/common/src/com/netscape/cms/client/ca/CAClient.java
deleted file mode 100644
index a72f95962..000000000
--- a/base/common/src/com/netscape/cms/client/ca/CAClient.java
+++ /dev/null
@@ -1,141 +0,0 @@
-//--- BEGIN COPYRIGHT BLOCK ---
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
-//
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-//
-//You should have received a copy of the GNU General Public License along
-//with this program; if not, write to the Free Software Foundation, Inc.,
-//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-//(C) 2012 Red Hat, Inc.
-//All rights reserved.
-//--- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client.ca;
-
-import java.net.URISyntaxException;
-import java.util.Collection;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertDataInfos;
-import com.netscape.certsrv.cert.CertEnrollmentRequest;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertRequestInfos;
-import com.netscape.certsrv.cert.CertRequestResource;
-import com.netscape.certsrv.cert.CertResource;
-import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.certsrv.cert.CertSearchRequest;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.certsrv.profile.ProfileData;
-import com.netscape.certsrv.profile.ProfileDataInfos;
-import com.netscape.certsrv.profile.ProfileResource;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-
-public class CAClient extends PKIClient {
-
-    private CertResource certClient;
-    private CertRequestResource certRequestClient;
-    private ProfileResource profileClient;
-
-    public CAClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        certRequestClient = createProxy(CertRequestResource.class);
-        certClient = createProxy(CertResource.class);
-        profileClient = createProxy(ProfileResource.class);
-    }
-
-    public Collection<CertRequestInfo> listRequests(String requestState, String requestType) {
-        CertRequestInfos infos = null;
-        Collection<CertRequestInfo> list = null;
-        infos = certRequestClient.listRequests(
-                requestState, requestType, new RequestId(0), 100, 100, 10);
-        list = infos.getRequests();
-
-        return list;
-    }
-
-    public CertDataInfos listCerts(String status) {
-        return certClient.listCerts(status, 100, 10);
-    }
-
-    public CertDataInfos searchCerts(CertSearchRequest data) {
-        return certClient.searchCerts(data, 100, 10);
-    }
-
-    public ProfileDataInfos listProfiles() {
-        return profileClient.listProfiles();
-    }
-
-    public ProfileData getProfile(String id) {
-
-        if (id == null) {
-            return null;
-        }
-
-        return profileClient.retrieveProfile(id);
-    }
-
-    public CertData getCertData(CertId id) {
-
-        if (id == null) {
-            return null;
-        }
-
-        return certClient.getCert(id);
-
-    }
-
-    public CertRequestInfos enrollCertificate(CertEnrollmentRequest data) {
-        if (data == null) {
-            return null;
-        }
-
-        return certRequestClient.enrollCert(data);
-    }
-
-    public CertRequestInfo getRequest(RequestId id) {
-        if (id == null) {
-            return null;
-        }
-        return certRequestClient.getRequestInfo(id);
-    }
-
-    public CertReviewResponse reviewRequest(RequestId id) {
-        if (id == null) {
-            return null;
-        }
-        return certRequestClient.reviewRequest(id);
-    }
-
-    public void approveRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.approveRequest(id, data);
-    }
-
-    public void rejectRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.rejectRequest(id, data);
-    }
-
-    public void cancelRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.cancelRequest(id, data);
-    }
-
-    public void updateRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.updateRequest(id, data);
-    }
-
-    public void validateRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.validateRequest(id, data);
-    }
-
-    public void unassignRequest(RequestId id, CertReviewResponse data) {
-        certRequestClient.unassignRequest(id, data);
-    }
-
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertCLI.java b/base/common/src/com/netscape/cms/client/cert/CertCLI.java
deleted file mode 100644
index f7bb27597..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertCLI.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.util.Arrays;
-
-import org.apache.commons.lang.StringUtils;
-import org.jboss.resteasy.plugins.providers.atom.Link;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertDataInfo;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertCLI extends CLI {
-
-    public MainCLI parent;
-    public CertClient client;
-
-    public CertCLI(MainCLI parent) {
-        super("cert", "Certificate management commands");
-        this.parent = parent;
-
-        addModule(new CertFindCLI(this));
-        addModule(new CertShowCLI(this));
-
-        addModule(new CertRevokeCLI(this));
-        addModule(new CertHoldCLI(this));
-        addModule(new CertReleaseHoldCLI(this));
-        addModule(new CertRequestSubmitCLI(this));
-        addModule(new CertRequestReviewCLI(this));
-        addModule(new CertRequestApproveCLI(this));
-    }
-
-    public void printHelp() {
-
-        System.out.println("Commands:");
-
-        int leftPadding = 1;
-        int rightPadding = 25;
-
-        for (CLI module : modules.values()) {
-            String label = name + "-" + module.getName();
-
-            int padding = rightPadding - leftPadding - label.length();
-            if (padding < 1)
-                padding = 1;
-
-            System.out.print(StringUtils.repeat(" ", leftPadding));
-            System.out.print(label);
-            System.out.print(StringUtils.repeat(" ", padding));
-            System.out.println(module.getDescription());
-        }
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        client = new CertClient(parent.config);
-        client.setVerbose(verbose);
-
-        if (args.length == 0) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String command = args[0];
-        String[] commandArgs = Arrays.copyOfRange(args, 1, args.length);
-
-        if (command == null) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CLI module = getModule(command);
-        if (module != null) {
-            module.execute(commandArgs);
-
-        } else {
-            System.err.println("Error: Invalid command \"" + command + "\"");
-            printHelp();
-            System.exit(1);
-        }
-    }
-
-    public static void printCertInfo(CertDataInfo info) {
-        System.out.println("  Serial Number: "+info.getID().toHexString());
-        System.out.println("  Subject DN: "+info.getSubjectDN());
-        System.out.println("  Status: "+info.getStatus());
-
-        Link link = info.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-    }
-
-    public static void printCertData(
-            CertData certData,
-            boolean showPrettyPrint,
-            boolean showEncoded) {
-
-        System.out.println("  Serial Number: " + certData.getSerialNumber().toHexString());
-        System.out.println("  Issuer: " + certData.getIssuerDN());
-        System.out.println("  Subject: " + certData.getSubjectDN());
-        System.out.println("  Status: " + certData.getStatus());
-        System.out.println("  Not Before: " + certData.getNotBefore());
-        System.out.println("  Not After: " + certData.getNotAfter());
-
-        Link link = certData.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-
-        String prettyPrint = certData.getPrettyPrint();
-        if (showPrettyPrint && prettyPrint != null) {
-            System.out.println();
-            System.out.println(prettyPrint);
-        }
-
-        String encoded = certData.getEncoded();
-        if (showEncoded && encoded != null) {
-            System.out.println();
-            System.out.println(encoded);
-        }
-    }
-
-    public static void printCertRequestInfo(CertRequestInfo info) {
-        System.out.println("  Request ID: " + info.getRequestId());
-        System.out.println("  Status: " + info.getRequestStatus());
-        System.out.println("  Type: " + info.getRequestType());
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertClient.java b/base/common/src/com/netscape/cms/client/cert/CertClient.java
deleted file mode 100644
index 1fcb9e40d..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertClient.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//--- BEGIN COPYRIGHT BLOCK ---
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
-//
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-//
-//You should have received a copy of the GNU General Public License along
-//with this program; if not, write to the Free Software Foundation, Inc.,
-//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-//(C) 2012 Red Hat, Inc.
-//All rights reserved.
-//--- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client.cert;
-
-import java.net.URISyntaxException;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertDataInfos;
-import com.netscape.certsrv.cert.CertEnrollmentRequest;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertRequestInfos;
-import com.netscape.certsrv.cert.CertRequestResource;
-import com.netscape.certsrv.cert.CertResource;
-import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.certsrv.cert.CertRevokeRequest;
-import com.netscape.certsrv.cert.CertSearchRequest;
-import com.netscape.certsrv.cert.CertUnrevokeRequest;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertClient extends PKIClient {
-
-    public CertResource certClient;
-    public CertRequestResource certRequestResource;
-
-    public CertClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        certClient = createProxy(CertResource.class);
-        certRequestResource = createProxy(CertRequestResource.class);
-    }
-
-    public CertData getCert(CertId id) {
-        return certClient.getCert(id);
-    }
-
-    public CertDataInfos findCerts(CertSearchRequest data, Integer start, Integer size) {
-        return certClient.searchCerts(data, start, size);
-    }
-
-    public CertRequestInfo revokeCert(CertId id, CertRevokeRequest request) {
-        return certClient.revokeCert(id, request);
-    }
-
-    public CertRequestInfo revokeCACert(CertId id, CertRevokeRequest request) {
-        return certClient.revokeCACert(id, request);
-    }
-
-    public CertRequestInfo unrevokeCert(CertId id, CertUnrevokeRequest request) {
-        return certClient.unrevokeCert(id, request);
-    }
-
-    public CertRequestInfos enrollRequest(CertEnrollmentRequest data) {
-        return certRequestResource.enrollCert(data);
-    }
-
-    public CertReviewResponse reviewRequest(RequestId id) {
-        return certRequestResource.reviewRequest(id);
-    }
-
-    public void approveRequest(RequestId id, CertReviewResponse data) {
-        certRequestResource.approveRequest(id, data);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
deleted file mode 100644
index f69506224..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
+++ /dev/null
@@ -1,388 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.bind.JAXBException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.ParseException;
-
-import com.netscape.certsrv.base.PKIException;
-import com.netscape.certsrv.cert.CertDataInfo;
-import com.netscape.certsrv.cert.CertDataInfos;
-import com.netscape.certsrv.cert.CertSearchRequest;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertFindCLI extends CLI {
-
-    public CertCLI parent;
-
-    public CertFindCLI(CertCLI parent) {
-        super("find", "Find certificates");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) {
-
-        addOptions();
-
-        CommandLine cmd = null;
-        CertSearchRequest searchData = null;
-        try {
-            cmd = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(-1);
-        }
-
-        if (cmd.hasOption("help")) {
-            printHelp();
-            System.exit(-1);
-        }
-
-        String fileName = null;
-
-        if (cmd.hasOption("input")) {
-            fileName = cmd.getOptionValue("input");
-            if (fileName == null || fileName.length() < 1) {
-                System.err.println("Error: No file name specified.");
-                printHelp();
-                System.exit(-1);
-            }
-        }
-        if (fileName != null) {
-            FileReader reader = null;
-            try {
-                reader = new FileReader(fileName);
-                searchData = CertSearchRequest.valueOf(reader);
-            } catch (FileNotFoundException e) {
-                System.err.println("Error: " + e.getMessage());
-                System.exit(-1);
-            } catch (JAXBException e) {
-                System.err.println("Error: " + e.getMessage());
-                System.exit(-1);
-            } finally {
-                if (reader != null)
-                    try {
-                        reader.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-            }
-        } else {
-            searchData = new CertSearchRequest();
-            searchData.setSerialNumberRangeInUse(true);
-        }
-        String s = cmd.getOptionValue("start");
-        Integer start = s == null ? null : Integer.valueOf(s);
-
-        s = cmd.getOptionValue("size");
-        Integer size = s == null ? null : Integer.valueOf(s);
-
-        addSearchAttribute(cmd, searchData);
-        CertDataInfos certs = null;
-        try {
-            certs = parent.client.findCerts(searchData, start, size);
-        } catch (PKIException e) {
-            System.err.println("Error: Cannot list certificates. " + e.getMessage());
-            System.exit(-1);
-        }
-        if (certs.getCertInfos() == null || certs.getCertInfos().isEmpty()) {
-            MainCLI.printMessage("No matches found.");
-            System.exit(-1);
-        }
-        MainCLI.printMessage(certs.getCertInfos().size() + " certificate(s) matched");
-
-        boolean first = true;
-
-        for (CertDataInfo cert : certs.getCertInfos()) {
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-
-            CertCLI.printCertInfo(cert);
-        }
-
-        MainCLI.printMessage("Number of entries returned " + certs.getCertInfos().size());
-    }
-
-    public void addOptions() {
-
-        Option option = null;
-
-        //pagination options
-        option = new Option(null, "start", true, "Page start");
-        option.setArgName("start");
-        options.addOption(option);
-
-        option = new Option(null, "size", true, "Page size");
-        option.setArgName("size");
-        options.addOption(option);
-
-        //help
-        options.addOption(null, "help", false, "Show help options");
-
-        //file input
-        option = new Option(null, "input", true, "File containing the search constraints");
-        option.setArgName("file path");
-        options.addOption(option);
-
-        //serialNumberinUse
-        option = new Option(null, "minSerialNumber", true, "Minimum serial number");
-        option.setArgName("serial number");
-        options.addOption(option);
-        option = new Option(null, "maxSerialNumber", true, "Maximum serial number");
-        option.setArgName("serial number");
-        options.addOption(option);
-
-        //subjectNameinUse
-        option = new Option(null, "name", true, "Subject's common name");
-        option.setArgName("name");
-        options.addOption(option);
-        option = new Option(null, "email", true, "Subject's email address");
-        option.setArgName("email");
-        options.addOption(option);
-        option = new Option(null, "uid", true, "Subject's userid");
-        option.setArgName("user id");
-        options.addOption(option);
-        option = new Option(null, "org", true, "Subject's organization");
-        option.setArgName("name");
-        options.addOption(option);
-        option = new Option(null, "orgUnit", true, "Subject's organization unit");
-        option.setArgName("name");
-        options.addOption(option);
-        option = new Option(null, "locality", true, "Subject's locality");
-        option.setArgName("name");
-        options.addOption(option);
-        option = new Option(null, "state", true, "Subject's state");
-        option.setArgName("name");
-        options.addOption(option);
-        option = new Option(null, "country", true, "Subject's country");
-        option.setArgName("name");
-        options.addOption(option);
-        options.addOption(null, "matchExactly", false, "Match exactly with the details provided");
-
-        //revokedByInUse
-        option = new Option(null, "revokedBy", true, "Certificate revoked by");
-        option.setArgName("user id");
-        options.addOption(option);
-
-        //revocationPeriod
-        option = new Option(null, "revokedOnFrom", true, "Revoked on or after this date");
-        option.setArgName("date");
-        options.addOption(option);
-        option = new Option(null, "revokedOnTo", true, "Revoked on or before this date");
-        option.setArgName("date");
-        options.addOption(option);
-
-        //revocationReason
-        option = new Option(null, "revocationReason", true, "Reason for revocation");
-        option.setArgName("reason");
-        options.addOption(option);
-
-        //issuedBy
-        option = new Option(null, "issuedBy", true, "Issued by");
-        option.setArgName("user id");
-        options.addOption(option);
-
-        //issuedFor(period)
-        option = new Option(null, "issuedOn", true, "Date issued");
-        option.setArgName("date");
-        options.addOption(option);
-
-        //certTypeinUse
-        option = new Option(null, "certTypeSubEmailCA", true, "Certifiate type: Subject Email CA");
-        option.setArgName("on|off");
-        options.addOption(option);
-        option = new Option(null, "certTypeSubSSLCA", true, "Certificate type: Subject SSL CA");
-        option.setArgName("on|off");
-        options.addOption(option);
-        option = new Option(null, "certTypeSecureEmail", true, "Certifiate Type: Secure Email");
-        option.setArgName("on|off");
-        options.addOption(option);
-        option = new Option(null, "certTypeSSLClient", true, "Certifiate Type: SSL Client");
-        option.setArgName("on|off");
-        options.addOption(option);
-        option = new Option(null, "certTypeSSLServer", true, "Certifiate Type: SSL Server");
-        option.setArgName("on|off");
-        options.addOption(option);
-
-        //validationNotBeforeInUse
-        option = new Option(null, "validNotBeforeFrom", true, "Valid not before start date");
-        option.setArgName("date");
-        options.addOption(option);
-        option = new Option(null, "validNotBeforeTo", true, "Valid not before end date");
-        option.setArgName("date");
-        options.addOption(option);
-
-        //validityNotAfterinUse
-        option = new Option(null, "validNotAfterFrom", true, "Valid not after start date");
-        option.setArgName("date");
-        options.addOption(option);
-        option = new Option(null, "validNotAfterTo", true, "Valid not after end date");
-        option.setArgName("date");
-        options.addOption(option);
-
-        //validityLengthinUse
-        option = new Option(null, "validityOperation", true, "Validity operation: \"<=\" or \">=\"");
-        option.setArgName("operation");
-        options.addOption(option);
-        option = new Option(null, "validityCount", true, "Validity count");
-        option.setArgName("count");
-        options.addOption(option);
-        option = new Option(null, "validityUnit", true, "Validity unit");
-        option.setArgName("milliseconds");
-        options.addOption(option);
-    }
-
-    public void addSearchAttribute(CommandLine cmd, CertSearchRequest csd) {
-        if (cmd.hasOption("minSerialNumber")) {
-            csd.setSerialNumberRangeInUse(true);
-            csd.setSerialFrom(cmd.getOptionValue("minSerialNumber"));
-        }
-        if (cmd.hasOption("maxSerialNumber")) {
-            csd.setSerialNumberRangeInUse(true);
-            csd.setSerialTo(cmd.getOptionValue("maxSerialNumber"));
-        }
-        if (cmd.hasOption("name")) {
-            csd.setSubjectInUse(true);
-            csd.setCommonName(cmd.getOptionValue("name"));
-        }
-        if (cmd.hasOption("email")) {
-            csd.setSubjectInUse(true);
-            csd.setEmail(cmd.getOptionValue("email"));
-        }
-        if (cmd.hasOption("uid")) {
-            csd.setSubjectInUse(true);
-            csd.setUserID(cmd.getOptionValue("uid"));
-        }
-        if (cmd.hasOption("org")) {
-            csd.setSubjectInUse(true);
-            csd.setOrg(cmd.getOptionValue("org"));
-        }
-        if (cmd.hasOption("orgUnit")) {
-            csd.setSubjectInUse(true);
-            csd.setOrgUnit(cmd.getOptionValue("orgUnit"));
-        }
-        if (cmd.hasOption("locality")) {
-            csd.setSubjectInUse(true);
-            csd.setLocality(cmd.getOptionValue("locality"));
-        }
-        if (cmd.hasOption("state")) {
-            csd.setSubjectInUse(true);
-            csd.setState(cmd.getOptionValue("state"));
-        }
-        if (cmd.hasOption("country")) {
-            csd.setSubjectInUse(true);
-            csd.setCountry(cmd.getOptionValue("country"));
-        }
-        if (cmd.hasOption("matchExactly")) {
-            csd.setMatchExactly(true);
-        }
-        if (cmd.hasOption("revokedBy")) {
-            csd.setRevokedByInUse(true);
-            csd.setRevokedBy(cmd.getOptionValue("revokedBy"));
-        }
-        if (cmd.hasOption("revokedOnFrom")) {
-            csd.setRevokedOnInUse(true);
-            csd.setRevokedOnFrom(cmd.getOptionValue("revokedOnFrom"));
-        }
-        if (cmd.hasOption("revokedOnTo")) {
-            csd.setRevokedOnInUse(true);
-            csd.setRevokedOnTo(cmd.getOptionValue("revokedOnTo"));
-        }
-        if (cmd.hasOption("revocationReason")) {
-            csd.setRevocationReasonInUse(true);
-            csd.setRevocationReason(cmd.getOptionValue("revocationReason"));
-        }
-        if (cmd.hasOption("issuedBy")) {
-            csd.setIssuedByInUse(true);
-            csd.setIssuedBy(cmd.getOptionValue("issuedBy"));
-        }
-        if (cmd.hasOption("issuedOn")) {
-            csd.setIssuedOnInUse(true);
-            csd.setIssuedOnFrom(cmd.getOptionValue("issuedOn"));
-        }
-        if (cmd.hasOption("certTypeSubEmailCA")) {
-            csd.setCertTypeInUse(true);
-            csd.setCertTypeSubEmailCA(cmd.getOptionValue("certTypeSubEmailCA"));
-        }
-        if (cmd.hasOption("certTypeSubSSLCA")) {
-            csd.setCertTypeInUse(true);
-            csd.setCertTypeSubSSLCA(cmd.getOptionValue("certTypeSubSSLCA"));
-        }
-        if (cmd.hasOption("certTypeSecureEmail")) {
-            csd.setCertTypeInUse(true);
-            csd.setCertTypeSecureEmail(cmd.getOptionValue("certTypeSecureEmail"));
-        }
-        if (cmd.hasOption("certTypeSSLClient")) {
-            csd.setCertTypeInUse(true);
-            csd.setCertTypeSSLClient(cmd.getOptionValue("certTypeSSLCllient"));
-        }
-        if (cmd.hasOption("certTypeSSLServer")) {
-            csd.setCertTypeInUse(true);
-            csd.setCertTypeSSLServer(cmd.getOptionValue("certTypeSSLServer"));
-        }
-        if (cmd.hasOption("validNotBeforeFrom")) {
-            csd.setValidNotBeforeInUse(true);
-            csd.setValidNotBeforeFrom(cmd.getOptionValue("validNotBeforeFrom"));
-        }
-        if (cmd.hasOption("validNotBeforeTo")) {
-            csd.setValidNotBeforeInUse(true);
-            csd.setValidNotBeforeTo(cmd.getOptionValue("validNotBeforeTo"));
-        }
-        if (cmd.hasOption("validNotAfterFrom")) {
-            csd.setValidNotAfterInUse(true);
-            csd.setValidNotAfterFrom(cmd.getOptionValue("validNotAfterFrom"));
-        }
-        if (cmd.hasOption("validNotAfterTo")) {
-            csd.setValidNotAfterInUse(true);
-            csd.setValidNotAfterTo(cmd.getOptionValue("validNotAfterTo"));
-        }
-        if (cmd.hasOption("validityOperation")) {
-            csd.setValidityLengthInUse(true);
-            csd.setValidityOperation(cmd.getOptionValue("validityOperation"));
-        }
-        if (cmd.hasOption("validityCount")) {
-            csd.setValidityLengthInUse(true);
-            csd.setValidityCount(cmd.getOptionValue("validityCount"));
-        }
-        if (cmd.hasOption("validityUnit")) {
-            csd.setValidityLengthInUse(true);
-            csd.setValidityUnit(cmd.getOptionValue("validityUnit"));
-        }
-
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java b/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java
deleted file mode 100644
index 33667f3f0..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertHoldCLI.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import netscape.security.x509.RevocationReason;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertRevokeRequest;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertHoldCLI extends CLI {
-
-    public CertCLI parent;
-
-    public CertHoldCLI(CertCLI parent) {
-        super("hold", "Place certificate on-hold");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Serial Number> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "comments", true, "Comments");
-        option.setArgName("comments");
-        options.addOption(option);
-
-        options.addOption(null, "force", false, "Force");
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CertId certID = new CertId(cmdArgs[0]);
-
-        if (!cmd.hasOption("force")) {
-
-            CertData certData = parent.client.getCert(certID);
-
-            System.out.println("Placing certificate on-hold:");
-
-            CertCLI.printCertData(certData, false, false);
-
-            System.out.print("Are you sure (Y/N)? ");
-            System.out.flush();
-
-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-            String line = reader.readLine();
-            if (!line.equalsIgnoreCase("Y")) {
-                System.exit(1);
-            }
-        }
-
-        CertRevokeRequest request = new CertRevokeRequest();
-        request.setReason(RevocationReason.CERTIFICATE_HOLD);
-        request.setComments(cmd.getOptionValue("comments"));
-
-        CertRequestInfo certRequestInfo = parent.client.revokeCert(certID, request);
-
-        if (verbose) {
-            CertCLI.printCertRequestInfo(certRequestInfo);
-        }
-
-        if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
-            CertData certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
-        } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
-        }
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java b/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java
deleted file mode 100644
index 10408273f..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertReleaseHoldCLI.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.apache.commons.cli.CommandLine;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertUnrevokeRequest;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertReleaseHoldCLI extends CLI {
-
-    public CertCLI parent;
-
-    public CertReleaseHoldCLI(CertCLI parent) {
-        super("release-hold", "Place certificate off-hold");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Serial Number> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        options.addOption(null, "force", false, "Force");
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CertId certID = new CertId(cmdArgs[0]);
-
-        if (!cmd.hasOption("force")) {
-
-            CertData certData = parent.client.getCert(certID);
-
-            System.out.println("Placing certificate off-hold:");
-
-            CertCLI.printCertData(certData, false, false);
-
-            System.out.print("Are you sure (Y/N)? ");
-            System.out.flush();
-
-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-            String line = reader.readLine();
-            if (!line.equalsIgnoreCase("Y")) {
-                System.exit(1);
-            }
-        }
-
-        CertUnrevokeRequest request = new CertUnrevokeRequest();
-
-        CertRequestInfo certRequestInfo = parent.client.unrevokeCert(certID, request);
-
-        if (verbose) {
-            CertCLI.printCertRequestInfo(certRequestInfo);
-        }
-
-        if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
-            CertData certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
-        } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
-        }
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java
deleted file mode 100644
index c96f482c8..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertRequestApproveCLI.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.netscape.cms.client.cert;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
-
-import com.netscape.certsrv.base.PKIException;
-import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-public class CertRequestApproveCLI extends CLI {
-    CertCLI parent;
-
-    public CertRequestApproveCLI(CertCLI parent) {
-        super("request-approve", "Approve certificate request");
-        this.parent = parent;
-    }
-
-    @Override
-    public void execute(String[] args) {
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(-1);
-        }
-
-        String[] cLineArgs = cmd.getArgs();
-
-        if (cLineArgs.length < 1) {
-            System.err.println("Error: No file name specified.");
-            printHelp();
-            System.exit(-1);
-        }
-        CertReviewResponse reviewInfo = null;
-        try {
-            JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class);
-            Unmarshaller unmarshaller = context.createUnmarshaller();
-            FileInputStream fis = new FileInputStream(cLineArgs[0].trim());
-            reviewInfo = (CertReviewResponse) unmarshaller.unmarshal(fis);
-            parent.client.approveRequest(reviewInfo.getRequestId(), reviewInfo);
-        } catch (PKIException e) {
-            System.err.println(e.getMessage());
-            System.exit(-1);
-        } catch (JAXBException e) {
-            System.err.println("Error: " + e.getMessage());
-            System.exit(-1);
-        } catch (FileNotFoundException e) {
-            System.err.println("Error: " + e.getMessage());
-            System.exit(-1);
-        }
-        MainCLI.printMessage("Approved certificate request " + reviewInfo.getRequestId().toString());
-    }
-
-    @Override
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <file name>", options);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java
deleted file mode 100644
index 22b1faed3..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertRequestReviewCLI.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.netscape.cms.client.cert;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.ParseException;
-
-import com.netscape.certsrv.base.PKIException;
-import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-public class CertRequestReviewCLI extends CLI {
-
-    CertCLI parent;
-
-    public CertRequestReviewCLI(CertCLI parent) {
-        super("request-review", "Review certificate request");
-        this.parent = parent;
-    }
-
-    @Override
-    public void execute(String[] args) {
-        CommandLine cmd = null;
-
-        Option output = new Option(null, "output", true, "Output Filename");
-        options.addOption(output);
-
-        try {
-            cmd = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(-1);
-        }
-
-        String[] cLineArgs = cmd.getArgs();
-
-        if (cLineArgs.length < 1) {
-            System.err.println("Error: No request id specified.");
-            printHelp();
-            System.exit(-1);
-        }
-        String filename = null;
-        if (cmd.hasOption("output")) {
-            filename = cmd.getOptionValue("output");
-        } else {
-            System.err.println("No output option specified.");
-            printHelp();
-            System.exit(-1);
-        }
-
-        if (filename == null || filename.trim().length() == 0) {
-            System.err.println("Specify the filename to write the request information");
-            printHelp();
-            System.exit(-1);
-        }
-
-        RequestId reqId = null;
-        try {
-            reqId = new RequestId(cLineArgs[0]);
-        } catch (NumberFormatException e) {
-            System.err.println("Error: Invalid RequestID: " + cLineArgs[0]);
-            System.exit(-1);
-        }
-
-        CertReviewResponse reviewInfo = null;
-        try {
-            reviewInfo = parent.client.reviewRequest(reqId);
-        } catch (PKIException e) {
-            System.err.println(e.getMessage());
-            System.exit(-1);
-        }
-
-        try {
-            JAXBContext context = JAXBContext.newInstance(CertReviewResponse.class);
-            Marshaller marshaller = context.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-
-            FileOutputStream stream = new FileOutputStream(filename);
-
-            marshaller.marshal(reviewInfo, stream);
-            MainCLI.printMessage("Downloaded certificate request " + cLineArgs[0]);
-        } catch (JAXBException e) {
-            System.err.println("Cannot write to the file. " + e);
-        } catch (FileNotFoundException e) {
-            System.err.println("File not found at " + filename);
-        }
-
-    }
-
-    @Override
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <request id>", options);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java
deleted file mode 100644
index cd974b031..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.netscape.cms.client.cert;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Collection;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
-
-import com.netscape.certsrv.cert.CertEnrollmentRequest;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertRequestInfos;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-public class CertRequestSubmitCLI extends CLI {
-
-    CertCLI parent;
-
-    public CertRequestSubmitCLI(CertCLI parent) {
-        super("request-submit", "Submit certificate request");
-        this.parent = parent;
-    }
-
-    @Override
-    public void execute(String[] args) {
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(-1);
-        }
-
-        String[] cLineArgs = cmd.getArgs();
-
-        if (cLineArgs.length < 1) {
-            System.err.println("Error: No filename specified.");
-            printHelp();
-            System.exit(-1);
-        }
-
-        CertEnrollmentRequest erd = null;
-
-        try {
-            erd = getEnrollmentRequest(cLineArgs[0]);
-            CertRequestInfos cri = parent.client.enrollRequest(erd);
-            MainCLI.printMessage("Submitted certificate request");
-            printRequestInformation(cri);
-        } catch (FileNotFoundException e) {
-            System.err.println("Error: " + e.getMessage());
-            System.exit(-1);
-        } catch (JAXBException e) {
-            System.err.println("Error: " + e.getMessage());
-            System.exit(-1);
-        }
-    }
-
-    private CertEnrollmentRequest getEnrollmentRequest(String fileName) throws JAXBException, FileNotFoundException {
-        CertEnrollmentRequest erd = null;
-        JAXBContext context = JAXBContext.newInstance(CertEnrollmentRequest.class);
-        Unmarshaller unmarshaller = context.createUnmarshaller();
-        FileInputStream fis = new FileInputStream(fileName);
-        erd = (CertEnrollmentRequest) unmarshaller.unmarshal(fis);
-        return erd;
-    }
-
-    private void printRequestInformation(CertRequestInfos cri) {
-        Collection<CertRequestInfo> allRequests = cri.getRequests();
-        for (CertRequestInfo x : allRequests) {
-            CertCLI.printCertRequestInfo(x);
-        }
-        System.out.println();
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <filename>", options);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java
deleted file mode 100644
index de5dddc09..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertRevokeCLI.java
+++ /dev/null
@@ -1,164 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import netscape.security.x509.RevocationReason;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.cert.CertRequestInfo;
-import com.netscape.certsrv.cert.CertRevokeRequest;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertRevokeCLI extends CLI {
-
-    public CertCLI parent;
-
-    public CertRevokeCLI(CertCLI parent) {
-        super("revoke", "Revoke certificate");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Serial Number> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        StringBuilder sb = new StringBuilder();
-
-        for (RevocationReason reason : RevocationReason.INSTANCES) {
-            if (sb.length() > 0) {
-                sb.append(", ");
-            }
-            sb.append(reason);
-            if (reason == RevocationReason.UNSPECIFIED) {
-                sb.append(" (default)");
-            }
-        }
-
-        Option option = new Option(null, "reason", true, "Revocation reason: " + sb);
-        option.setArgName("reason");
-        options.addOption(option);
-
-        option = new Option(null, "comments", true, "Comments");
-        option.setArgName("comments");
-        options.addOption(option);
-
-        options.addOption(null, "ca", false, "CA signing certificate");
-        options.addOption(null, "force", false, "Force");
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CertId certID = new CertId(cmdArgs[0]);
-
-        String string = cmd.getOptionValue("reason", RevocationReason.UNSPECIFIED.toString());
-        RevocationReason reason = RevocationReason.valueOf(string);
-
-        if (reason == null) {
-            System.err.println("Error: Invalid revocation reason: "+string);
-            printHelp();
-            System.exit(1);
-            return;
-        }
-
-        if (!cmd.hasOption("force")) {
-
-            CertData certData = parent.client.getCert(certID);
-
-            if (reason == RevocationReason.CERTIFICATE_HOLD) {
-                System.out.println("Placing certificate on-hold:");
-            } else if (reason == RevocationReason.REMOVE_FROM_CRL) {
-                System.out.println("Placing certificate off-hold:");
-            } else {
-                System.out.println("Revoking certificate:");
-            }
-
-            CertCLI.printCertData(certData, false, false);
-
-            System.out.print("Are you sure (Y/N)? ");
-            System.out.flush();
-
-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-            String line = reader.readLine();
-            if (!line.equalsIgnoreCase("Y")) {
-                System.exit(1);
-            }
-        }
-
-        CertRevokeRequest request = new CertRevokeRequest();
-        request.setReason(reason);
-        request.setComments(cmd.getOptionValue("comments"));
-
-        CertRequestInfo certRequestInfo;
-
-        if (cmd.hasOption("ca")) {
-            certRequestInfo = parent.client.revokeCACert(certID, request);
-        } else {
-            certRequestInfo = parent.client.revokeCert(certID, request);
-        }
-
-        if (verbose) {
-            CertCLI.printCertRequestInfo(certRequestInfo);
-        }
-
-        if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            if (reason == RevocationReason.CERTIFICATE_HOLD) {
-                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
-            } else if (reason == RevocationReason.REMOVE_FROM_CRL) {
-                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
-            } else {
-                MainCLI.printMessage("Revoked certificate \"" + certID.toHexString() + "\"");
-            }
-
-            CertData certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
-        } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
-        }
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java b/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java
deleted file mode 100644
index 4fcfc8c3d..000000000
--- a/base/common/src/com/netscape/cms/client/cert/CertShowCLI.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cert;
-
-import java.io.FileWriter;
-import java.io.PrintWriter;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.dbs.certdb.CertId;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class CertShowCLI extends CLI {
-
-    public CertCLI parent;
-
-    public CertShowCLI(CertCLI parent) {
-        super("show", "Show certificate");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Serial Number> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "output", true, "Output file");
-        option.setArgName("file");
-        options.addOption(option);
-
-        options.addOption(null, "pretty", false, "Pretty print");
-        options.addOption(null, "encoded", false, "Base-64 encoded");
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        boolean showPrettyPrint = cmd.hasOption("pretty");
-        boolean showEncoded = cmd.hasOption("encoded");
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CertId certID = new CertId(cmdArgs[0]);
-        String file = cmd.getOptionValue("output");
-
-        CertData certData = parent.client.getCert(certID);
-
-        String encoded = certData.getEncoded();
-        if (encoded != null && file != null) {
-            // store cert to file
-            PrintWriter out = new PrintWriter(new FileWriter(file));
-            out.print(encoded);
-            out.close();
-        }
-
-        MainCLI.printMessage("Certificate \"" + certID.toHexString() + "\"");
-
-        CertCLI.printCertData(certData, showPrettyPrint, showEncoded);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cli/CLI.java b/base/common/src/com/netscape/cms/client/cli/CLI.java
deleted file mode 100644
index 1fd0c0dc4..000000000
--- a/base/common/src/com/netscape/cms/client/cli/CLI.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cli;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
-
-
-/**
- * @author Endi S. Dewata
- */
-public class CLI {
-
-    public static boolean verbose;
-
-    public static CommandLineParser parser = new PosixParser();
-    public static HelpFormatter formatter = new HelpFormatter();
-
-    public String name;
-    public String description;
-
-    public Options options = new Options();
-    public Map<String, CLI> modules = new LinkedHashMap<String, CLI>();
-
-    public CLI(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void addModule(CLI module) {
-        modules.put(module.getName(), module);
-    }
-
-    public CLI getModule(String name) {
-        return modules.get(name);
-    }
-
-    public void execute(String[] args) throws Exception {
-    }
-
-    public void printHelp() {
-    }
-
-    public static boolean isVerbose() {
-        return verbose;
-    }
-
-    public static void setVerbose(boolean verbose) {
-        CLI.verbose = verbose;
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/cli/MainCLI.java b/base/common/src/com/netscape/cms/client/cli/MainCLI.java
deleted file mode 100644
index 7df2224e9..000000000
--- a/base/common/src/com/netscape/cms/client/cli/MainCLI.java
+++ /dev/null
@@ -1,281 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.cli;
-
-import java.io.File;
-import java.net.URISyntaxException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang.StringUtils;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.crypto.CryptoToken;
-import org.mozilla.jss.util.IncorrectPasswordException;
-import org.mozilla.jss.util.Password;
-
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.cert.CertCLI;
-import com.netscape.cms.client.group.GroupCLI;
-import com.netscape.cms.client.user.UserCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class MainCLI extends CLI {
-
-    public ClientConfig config = new ClientConfig();
-
-    public MainCLI() throws Exception {
-        super("pki", "PKI command-line interface");
-
-        addModule(new CertCLI(this));
-        addModule(new GroupCLI(this));
-        addModule(new UserCLI(this));
-    }
-
-    public void printHelp() {
-
-        formatter.printHelp(name+" [OPTIONS..] <command> [ARGS..]", options);
-
-        System.out.println();
-        System.out.println("Commands:");
-
-        int leftPadding = 1;
-        int rightPadding = 18;
-
-        for (CLI plugin : modules.values()) {
-            String label = plugin.getName();
-
-            int padding = rightPadding - leftPadding - label.length();
-            if (padding < 1) padding = 1;
-
-            System.out.print(StringUtils.repeat(" ", leftPadding));
-            System.out.print(label);
-            System.out.print(StringUtils.repeat(" ", padding));
-            System.out.println(plugin.getDescription());
-        }
-    }
-
-    public void printHelpCommand(String pluginName) {
-        CLI plugin = getModule(pluginName);
-        plugin.printHelp();
-    }
-
-    public void createOptions(Options options) {
-
-        Option option = new Option("U", true, "Server URI");
-        option.setArgName("uri");
-        options.addOption(option);
-
-        option = new Option("P", true, "Protocol (default: http)");
-        option.setArgName("protocol");
-        options.addOption(option);
-
-        option = new Option("h", true, "Hostname (default: localhost)");
-        option.setArgName("hostname");
-        options.addOption(option);
-
-        option = new Option("p", true, "Port (default: 8080)");
-        option.setArgName("port");
-        options.addOption(option);
-
-        option = new Option("t", true, "Subsystem type (default: ca)");
-        option.setArgName("type");
-        options.addOption(option);
-
-        option = new Option("d", true, "Certificate database");
-        option.setArgName("database");
-        options.addOption(option);
-
-        option = new Option("n", true, "Certificate nickname");
-        option.setArgName("nickname");
-        options.addOption(option);
-
-        option = new Option("u", true, "Username");
-        option.setArgName("username");
-        options.addOption(option);
-
-        option = new Option("w", true, "Password");
-        option.setArgName("password");
-        options.addOption(option);
-
-        options.addOption("v", false, "Verbose");
-        options.addOption(null, "help", false, "Help");
-    }
-
-    public void parseOptions(CommandLine cmd) throws URISyntaxException {
-
-        String uri = cmd.getOptionValue("U");
-
-        String protocol = cmd.getOptionValue("P", "http");
-        String hostname = cmd.getOptionValue("h", "localhost");
-        String port = cmd.getOptionValue("p", "8080");
-        String type = cmd.getOptionValue("t", "ca");
-
-        if (uri == null)
-            uri = protocol + "://" + hostname + ":" + port + "/" + type;
-
-        config.setServerURI(uri);
-
-        String certDatabase = cmd.getOptionValue("d");
-        String certNickname = cmd.getOptionValue("n");
-        String username = cmd.getOptionValue("u");
-        String password = cmd.getOptionValue("w");
-
-        // convert into absolute path
-        if (certDatabase != null)
-            config.setCertDatabase(new File(certDatabase).getAbsolutePath());
-
-        if (certNickname != null)
-            config.setCertNickname(certNickname);
-
-        if (username != null)
-            config.setUsername(username);
-
-        if (password != null)
-            config.setPassword(password);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        CLI module;
-        String[] moduleArgs;
-
-        try {
-            createOptions(options);
-
-            CommandLine cmd;
-            try {
-                cmd = parser.parse(options, args, true);
-            } catch (Exception e) {
-                throw new Error(e.getMessage(), e);
-            }
-
-            String[] cmdArgs = cmd.getArgs();
-
-            if (cmdArgs.length == 0 || cmd.hasOption("help")) {
-                printHelp();
-                System.exit(1);
-            }
-
-            verbose = cmd.hasOption("v");
-
-            if (verbose) {
-                System.out.print("Command:");
-                for (String arg : cmdArgs) {
-                    if (arg.contains(" ")) arg = "\""+arg+"\"";
-                    System.out.print(" "+arg);
-                }
-                System.out.println();
-            }
-
-            parseOptions(cmd);
-
-            String command = cmdArgs[0];
-            String moduleName;
-            String moduleCommand;
-
-            // If a command contains a '-' sign it will be
-            // split into module name and module command.
-            // Otherwise it's a single command.
-            int i = command.indexOf('-');
-            if (i >= 0) { // <module name>-<module command>
-                moduleName = command.substring(0, i);
-                moduleCommand = command.substring(i+1);
-
-            } else { // <command>
-                moduleName = command;
-                moduleCommand = null;
-            }
-
-            // get command module
-            module = getModule(moduleName);
-            if (module == null)
-                throw new Error("Invalid command \"" + command + "\".");
-
-            // prepare module arguments
-            if (moduleCommand != null) {
-                moduleArgs = new String[cmdArgs.length];
-                moduleArgs[0] = moduleCommand;
-                System.arraycopy(cmdArgs, 1, moduleArgs, 1, cmdArgs.length-1);
-
-            } else {
-                moduleArgs = new String[cmdArgs.length-1];
-                System.arraycopy(cmdArgs, 1, moduleArgs, 0, cmdArgs.length-1);
-            }
-
-        } catch (Throwable t) {
-            if (verbose) {
-                t.printStackTrace(System.err);
-            } else {
-                System.err.println(t.getClass().getSimpleName()+": "+t.getMessage());
-            }
-            printHelp();
-            System.exit(1);
-            return;
-        }
-
-        // execute module command
-        try {
-            if (verbose) System.out.println("Server URI: "+config.getServerURI());
-
-            // initialize certificate database if specified
-            if (config.getCertDatabase() != null) {
-
-                if (verbose) System.out.println("Certificate database: "+config.getCertDatabase());
-                CryptoManager.initialize(config.getCertDatabase());
-
-                if (config.getPassword() != null) {
-                    try {
-                        CryptoManager manager = CryptoManager.getInstance();
-                        CryptoToken token = manager.getInternalKeyStorageToken();
-                        Password password = new Password(config.getPassword().toCharArray());
-                        token.login(password);
-
-                    } catch (IncorrectPasswordException e) {
-                        throw new Error("Incorrect certificate database password.", e);
-                    }
-                }
-            }
-
-            // execute module command
-            module.execute(moduleArgs);
-
-        } catch (Throwable t) {
-            if (verbose) {
-                t.printStackTrace(System.err);
-            } else {
-                System.err.println(t.getClass().getSimpleName()+": "+t.getMessage());
-            }
-            System.exit(1);
-        }
-    }
-
-    public static void printMessage(String message) {
-        System.out.println(StringUtils.repeat("-", message.length()));
-        System.out.println(message);
-        System.out.println(StringUtils.repeat("-", message.length()));
-    }
-
-    public static void main(String args[]) throws Exception {
-        MainCLI cli = new MainCLI();
-        cli.execute(args);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupAddCLI.java b/base/common/src/com/netscape/cms/client/group/GroupAddCLI.java
deleted file mode 100644
index f32fffd5d..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupAddCLI.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupAddCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupAddCLI(GroupCLI parent) {
-        super("add", "Add group");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "description", true, "Description");
-        option.setArgName("description");
-        option.setRequired(true);
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = cmdArgs[0];
-
-        GroupData groupData = new GroupData();
-        groupData.setID(groupID);
-        groupData.setDescription(cmd.getOptionValue("description"));
-
-        groupData = parent.client.addGroup(groupData);
-
-        MainCLI.printMessage("Added group \""+groupID+"\"");
-
-        GroupCLI.printGroup(groupData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java b/base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java
deleted file mode 100644
index 965ad4ee9..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupAddMemberCLI.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupAddMemberCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupAddMemberCLI(GroupCLI parent) {
-        super("add-member", "Add group member");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> <Member ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 2) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = args[0];
-        String memberID = args[1];
-
-        GroupMemberData groupMemberData = parent.client.addGroupMember(groupID, memberID);
-
-        MainCLI.printMessage("Added group member \""+memberID+"\"");
-
-        GroupCLI.printGroupMember(groupMemberData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupCLI.java b/base/common/src/com/netscape/cms/client/group/GroupCLI.java
deleted file mode 100644
index b106c6fc1..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupCLI.java
+++ /dev/null
@@ -1,124 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import java.util.Arrays;
-
-import org.apache.commons.lang.StringUtils;
-import org.jboss.resteasy.plugins.providers.atom.Link;
-
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupCLI extends CLI {
-
-    public MainCLI parent;
-    public GroupClient client;
-
-    public GroupCLI(MainCLI parent) {
-        super("group", "Group management commands");
-        this.parent = parent;
-
-        addModule(new GroupFindCLI(this));
-        addModule(new GroupShowCLI(this));
-        addModule(new GroupAddCLI(this));
-        addModule(new GroupModifyCLI(this));
-        addModule(new GroupRemoveCLI(this));
-
-        addModule(new GroupFindMemberCLI(this));
-        addModule(new GroupShowMemberCLI(this));
-        addModule(new GroupAddMemberCLI(this));
-        addModule(new GroupRemoveMemberCLI(this));
-    }
-
-    public void printHelp() {
-
-        System.out.println("Commands:");
-
-        int leftPadding = 1;
-        int rightPadding = 25;
-
-        for (CLI module : modules.values()) {
-            String label = name+"-"+module.getName();
-
-            int padding = rightPadding - leftPadding - label.length();
-            if (padding < 1) padding = 1;
-
-            System.out.print(StringUtils.repeat(" ", leftPadding));
-            System.out.print(label);
-            System.out.print(StringUtils.repeat(" ", padding));
-            System.out.println(module.getDescription());
-        }
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        client = new GroupClient(parent.config);
-        client.setVerbose(verbose);
-
-        if (args.length == 0) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String command = args[0];
-        String[] commandArgs = Arrays.copyOfRange(args, 1, args.length);
-
-        if (command == null) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CLI module = getModule(command);
-        if (module != null) {
-            module.execute(commandArgs);
-
-        } else {
-            System.err.println("Error: Invalid command \""+command+"\"");
-            printHelp();
-            System.exit(1);
-        }
-    }
-
-    public static void printGroup(GroupData groupData) {
-        System.out.println("  Group ID: "+groupData.getID());
-
-        String description = groupData.getDescription();
-        if (!StringUtils.isEmpty(description)) System.out.println("  Description: "+description);
-
-        Link link = groupData.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-    }
-
-    public static void printGroupMember(GroupMemberData groupMemberData) {
-        System.out.println("  Member: "+groupMemberData.getID());
-
-        Link link = groupMemberData.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupClient.java b/base/common/src/com/netscape/cms/client/group/GroupClient.java
deleted file mode 100644
index b3784ef46..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupClient.java
+++ /dev/null
@@ -1,89 +0,0 @@
-//--- BEGIN COPYRIGHT BLOCK ---
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
-//
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-//
-//You should have received a copy of the GNU General Public License along
-//with this program; if not, write to the Free Software Foundation, Inc.,
-//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-//(C) 2012 Red Hat, Inc.
-//All rights reserved.
-//--- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client.group;
-
-import java.net.URISyntaxException;
-
-import org.jboss.resteasy.client.ClientResponse;
-
-import com.netscape.certsrv.group.GroupCollection;
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.certsrv.group.GroupMemberCollection;
-import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.certsrv.group.GroupMemberResource;
-import com.netscape.certsrv.group.GroupResource;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupClient extends PKIClient {
-
-    public GroupResource groupClient;
-    public GroupMemberResource groupMemberClient;
-
-    public GroupClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        groupClient = createProxy(GroupResource.class);
-        groupMemberClient = createProxy(GroupMemberResource.class);
-    }
-
-    public GroupCollection findGroups(String groupIDFilter, Integer start, Integer size) {
-        return groupClient.findGroups(groupIDFilter, start, size);
-    }
-
-    public GroupData getGroup(String groupID) {
-        return groupClient.getGroup(groupID);
-    }
-
-    public GroupData addGroup(GroupData groupData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<GroupData> response = (ClientResponse<GroupData>)groupClient.addGroup(groupData);
-        return getEntity(response);
-    }
-
-    public GroupData modifyGroup(String groupID, GroupData groupData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<GroupData> response = (ClientResponse<GroupData>)groupClient.modifyGroup(groupID, groupData);
-        return getEntity(response);
-    }
-
-    public void removeGroup(String groupID) {
-        groupClient.removeGroup(groupID);
-    }
-
-    public GroupMemberCollection findGroupMembers(String groupID, Integer start, Integer size) {
-        return groupMemberClient.findGroupMembers(groupID, start, size);
-    }
-
-    public GroupMemberData getGroupMember(String groupID, String memberID) {
-        return groupMemberClient.getGroupMember(groupID, memberID);
-    }
-
-    public GroupMemberData addGroupMember(String groupID, String memberID) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<GroupMemberData> response = (ClientResponse<GroupMemberData>)groupMemberClient.addGroupMember(groupID, memberID);
-        return getEntity(response);
-    }
-
-    public void removeGroupMember(String groupID, String memberID) {
-        groupMemberClient.removeGroupMember(groupID, memberID);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupFindCLI.java b/base/common/src/com/netscape/cms/client/group/GroupFindCLI.java
deleted file mode 100644
index 41263c7b9..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupFindCLI.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import java.util.Collection;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.group.GroupCollection;
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupFindCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupFindCLI(GroupCLI parent) {
-        super("find", "Find groups");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " [FILTER] [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "start", true, "Page start");
-        option.setArgName("start");
-        options.addOption(option);
-
-        option = new Option(null, "size", true, "Page size");
-        option.setArgName("size");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-        String filter = cmdArgs.length > 0 ? cmdArgs[0] : null;
-
-        String s = cmd.getOptionValue("start");
-        Integer start = s == null ? null : Integer.valueOf(s);
-
-        s = cmd.getOptionValue("size");
-        Integer size = s == null ? null : Integer.valueOf(s);
-
-        GroupCollection response = parent.client.findGroups(filter, start, size);
-
-        Collection<GroupData> entries = response.getGroups();
-
-        MainCLI.printMessage(entries.size()+" group(s) matched");
-
-        boolean first = true;
-
-        for (GroupData groupData : entries) {
-
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-
-            GroupCLI.printGroup(groupData);
-        }
-
-        MainCLI.printMessage("Number of entries returned "+entries.size());
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java b/base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java
deleted file mode 100644
index ca8273270..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupFindMemberCLI.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import java.util.Collection;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.group.GroupMemberCollection;
-import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupFindMemberCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupFindMemberCLI(GroupCLI parent) {
-        super("find-member", "Find group members");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "start", true, "Page start");
-        option.setArgName("start");
-        options.addOption(option);
-
-        option = new Option(null, "size", true, "Page size");
-        option.setArgName("size");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = cmdArgs[0];
-
-        String s = cmd.getOptionValue("start");
-        Integer start = s == null ? null : Integer.valueOf(s);
-
-        s = cmd.getOptionValue("size");
-        Integer size = s == null ? null : Integer.valueOf(s);
-
-        GroupMemberCollection response = parent.client.findGroupMembers(groupID, start, size);
-
-        Collection<GroupMemberData> entries = response.getMembers();
-
-        MainCLI.printMessage(entries.size()+" group member(s) matched");
-
-        boolean first = true;
-
-        for (GroupMemberData groupMemberData : entries) {
-
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-
-            GroupCLI.printGroupMember(groupMemberData);
-        }
-
-        MainCLI.printMessage("Number of entries returned "+entries.size());
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java b/base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java
deleted file mode 100644
index b2b5c8553..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupModifyCLI.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupModifyCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupModifyCLI(GroupCLI parent) {
-        super("mod", "Modify group");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "description", true, "Description");
-        option.setArgName("description");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = cmdArgs[0];
-
-        GroupData groupData = new GroupData();
-        groupData.setID(groupID);
-        groupData.setDescription(cmd.getOptionValue("description"));
-
-        groupData = parent.client.modifyGroup(groupID, groupData);
-
-        MainCLI.printMessage("Modified group \""+groupID+"\"");
-
-        GroupCLI.printGroup(groupData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java b/base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java
deleted file mode 100644
index 45e779860..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupRemoveCLI.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupRemoveCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupRemoveCLI(GroupCLI parent) {
-        super("del", "Remove group");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = args[0];
-
-        parent.client.removeGroup(groupID);
-
-        MainCLI.printMessage("Deleted group \""+groupID+"\"");
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java b/base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java
deleted file mode 100644
index 25807ae31..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupRemoveMemberCLI.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupRemoveMemberCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupRemoveMemberCLI(GroupCLI parent) {
-        super("remove-member", "Remove group member");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> <Member ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 2) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = args[0];
-        String memberID = args[1];
-
-        parent.client.removeGroupMember(groupID, memberID);
-
-        MainCLI.printMessage("Deleted group member \""+memberID+"\"");
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java b/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java
deleted file mode 100644
index 3e24f3e5d..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupShowCLI.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import com.netscape.certsrv.group.GroupData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupShowCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupShowCLI(GroupCLI parent) {
-        super("show", "Show group");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = args[0];
-
-        GroupData groupData = parent.client.getGroup(groupID);
-
-        MainCLI.printMessage("Group \""+groupID+"\"");
-
-        GroupCLI.printGroup(groupData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java b/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java
deleted file mode 100644
index 9d828416f..000000000
--- a/base/common/src/com/netscape/cms/client/group/GroupShowMemberCLI.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.group;
-
-import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class GroupShowMemberCLI extends CLI {
-
-    public GroupCLI parent;
-
-    public GroupShowMemberCLI(GroupCLI parent) {
-        super("show-member", "Show group member");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <Group ID> <Member ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 2) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String groupID = args[0];
-        String memberID = args[1];
-
-        GroupMemberData groupMemberData = parent.client.getGroupMember(groupID, memberID);
-
-        MainCLI.printMessage("Group member \""+memberID+"\"");
-
-        GroupCLI.printGroupMember(groupMemberData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/kra/DRMClient.java b/base/common/src/com/netscape/cms/client/kra/DRMClient.java
deleted file mode 100644
index 4bcf52987..000000000
--- a/base/common/src/com/netscape/cms/client/kra/DRMClient.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.netscape.cms.client.kra;
-
-import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.jboss.resteasy.client.ClientResponse;
-
-import com.netscape.certsrv.cert.CertData;
-import com.netscape.certsrv.dbs.keydb.KeyId;
-import com.netscape.certsrv.key.KeyArchivalRequest;
-import com.netscape.certsrv.key.KeyData;
-import com.netscape.certsrv.key.KeyDataInfo;
-import com.netscape.certsrv.key.KeyDataInfos;
-import com.netscape.certsrv.key.KeyRecoveryRequest;
-import com.netscape.certsrv.key.KeyRequestInfo;
-import com.netscape.certsrv.key.KeyRequestInfos;
-import com.netscape.certsrv.key.KeyRequestResource;
-import com.netscape.certsrv.key.KeyResource;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.certsrv.system.SystemCertificateResource;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-import com.netscape.cmsutil.util.Utils;
-
-public class DRMClient  extends PKIClient {
-
-    private KeyResource keyClient;
-    private KeyRequestResource keyRequestClient;
-    private SystemCertificateResource systemCertClient;
-
-    public DRMClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        systemCertClient = createProxy(SystemCertificateResource.class);
-        keyRequestClient = createProxy(KeyRequestResource.class);
-        keyClient = createProxy(KeyResource.class);
-    }
-
-    public String getTransportCert() {
-        @SuppressWarnings("unchecked")
-        ClientResponse<CertData> response = (ClientResponse<CertData>) systemCertClient
-                .getTransportCert();
-        CertData certData = getEntity(response);
-        String transportCert = certData.getEncoded();
-        return transportCert;
-    }
-
-    public Collection<KeyRequestInfo> listRequests(String requestState, String requestType) {
-        KeyRequestInfos infos = keyRequestClient.listRequests(
-                requestState, requestType, null, new RequestId(0), 100, 100, 10
-                );
-        Collection<KeyRequestInfo> list = infos.getRequests();
-        return list;
-    }
-
-    public KeyRequestInfo archiveSecurityData(byte[] encoded, String clientId, String dataType) {
-        // create archival request
-        KeyArchivalRequest data = new KeyArchivalRequest();
-        String req1 = Utils.base64encode(encoded);
-        data.setWrappedPrivateData(req1);
-        data.setClientId(clientId);
-        data.setDataType(dataType);
-
-        KeyRequestInfo info = keyRequestClient.archiveKey(data);
-        return info;
-    }
-
-    public KeyDataInfo getKeyData(String clientId, String status) {
-        KeyDataInfos infos = keyClient.listKeys(clientId, status, 100, 10);
-        Collection<KeyDataInfo> list = infos.getKeyInfos();
-        Iterator<KeyDataInfo> iter = list.iterator();
-
-        while (iter.hasNext()) {
-            KeyDataInfo info = iter.next();
-            if (info != null) {
-                // return the first one
-                return info;
-            }
-        }
-        return null;
-    }
-
-    public KeyRequestInfo requestRecovery(KeyId keyId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
-        // create recovery request
-        KeyRecoveryRequest data = new KeyRecoveryRequest();
-        data.setKeyId(keyId);
-        if (rpwd != null) {
-            data.setSessionWrappedPassphrase(Utils.base64encode(rpwd));
-        }
-        if (rkey != null) {
-            data.setTransWrappedSessionKey(Utils.base64encode(rkey));
-        }
-
-        if (nonceData != null) {
-            data.setNonceData(Utils.base64encode(nonceData));
-        }
-
-        KeyRequestInfo info = keyRequestClient.recoverKey(data);
-        return info;
-    }
-
-    public void approveRecovery(RequestId recoveryId) {
-        keyRequestClient.approveRequest(recoveryId);
-    }
-
-    public KeyData retrieveKey(KeyId keyId, RequestId requestId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
-        // create recovery request
-        KeyRecoveryRequest data = new KeyRecoveryRequest();
-        data.setKeyId(keyId);
-        data.setRequestId(requestId);
-        if (rkey != null) {
-            data.setTransWrappedSessionKey(Utils.base64encode(rkey));
-        }
-        if (rpwd != null) {
-            data.setSessionWrappedPassphrase(Utils.base64encode(rpwd));
-        }
-
-        if (nonceData != null) {
-            data.setNonceData(Utils.base64encode(nonceData));
-        }
-
-        KeyData key = keyClient.retrieveKey(data);
-        return key;
-    }
-
-    public KeyRequestInfo getRequest(RequestId id) {
-        return keyRequestClient.getRequestInfo(id);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java b/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java
deleted file mode 100644
index c9ee28718..000000000
--- a/base/common/src/com/netscape/cms/client/system/SystemConfigClient.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client.system;
-
-import java.net.URISyntaxException;
-
-import com.netscape.certsrv.system.ConfigurationRequest;
-import com.netscape.certsrv.system.ConfigurationResponse;
-import com.netscape.certsrv.system.InstallToken;
-import com.netscape.certsrv.system.InstallTokenRequest;
-import com.netscape.certsrv.system.SystemConfigResource;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-
-
-/**
- * @author alee
- *
- */
-public class SystemConfigClient extends PKIClient {
-
-    private SystemConfigResource configClient;
-
-    public SystemConfigClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        configClient = createProxy(SystemConfigResource.class);
-    }
-
-    public ConfigurationResponse configure(ConfigurationRequest data) {
-        return configClient.configure(data);
-    }
-
-    public InstallToken getInstallToken(InstallTokenRequest data) {
-        return configClient.getInstallToken(data);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserAddCLI.java b/base/common/src/com/netscape/cms/client/user/UserAddCLI.java
deleted file mode 100644
index f65d75cd9..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserAddCLI.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserAddCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserAddCLI(UserCLI parent) {
-        super("add", "Add user");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "fullName", true, "Full name");
-        option.setArgName("fullName");
-        option.setRequired(true);
-        options.addOption(option);
-
-        option = new Option(null, "email", true, "Email");
-        option.setArgName("email");
-        options.addOption(option);
-
-        option = new Option(null, "password", true, "Password");
-        option.setArgName("password");
-        options.addOption(option);
-
-        option = new Option(null, "phone", true, "Phone");
-        option.setArgName("phone");
-        options.addOption(option);
-
-        option = new Option(null, "type", true, "Type");
-        option.setArgName("type");
-        options.addOption(option);
-
-        option = new Option(null, "state", true, "State");
-        option.setArgName("state");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userId = cmdArgs[0];
-
-        UserData userData = new UserData();
-        userData.setID(userId);
-        userData.setFullName(cmd.getOptionValue("fullName"));
-        userData.setEmail(cmd.getOptionValue("email"));
-        userData.setPassword(cmd.getOptionValue("password"));
-        userData.setPhone(cmd.getOptionValue("phone"));
-        userData.setType(cmd.getOptionValue("type"));
-        userData.setState(cmd.getOptionValue("state"));
-
-        userData = parent.client.addUser(userData);
-
-        MainCLI.printMessage("Added user \"" + userId + "\"");
-
-        UserCLI.printUser(userData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java
deleted file mode 100644
index 61ca60137..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserAddCertCLI.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.io.File;
-import java.util.Scanner;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserCertData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserAddCertCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserAddCertCLI(UserCLI parent) {
-        super("add-cert", "Add user cert");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "input", true, "Input file");
-        option.setArgName("file");
-        option.setRequired(true);
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userId = cmdArgs[0];
-        String file = cmd.getOptionValue("input");
-
-        // get cert from file
-        if (verbose) {
-            System.out.println("Reading cert from "+file+".");
-        }
-        String encoded = new Scanner(new File(file)).useDelimiter("\\A").next();
-        if (verbose) {
-            System.out.println(encoded);
-        }
-
-        UserCertData userCertData = new UserCertData();
-        userCertData.setEncoded(encoded);
-
-        if (verbose) {
-            System.out.println(userCertData);
-        }
-
-        userCertData = parent.client.addUserCert(userId, userCertData);
-
-        MainCLI.printMessage("Added certificate \"" + userCertData.getID() + "\"");
-
-        UserCLI.printCert(userCertData, false, false);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/common/src/com/netscape/cms/client/user/UserCLI.java
deleted file mode 100644
index cc9bc8aa5..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserCLI.java
+++ /dev/null
@@ -1,162 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.util.Arrays;
-
-import org.apache.commons.lang.StringUtils;
-import org.jboss.resteasy.plugins.providers.atom.Link;
-
-import com.netscape.certsrv.user.UserCertData;
-import com.netscape.certsrv.user.UserData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserCLI extends CLI {
-
-    public MainCLI parent;
-    public UserClient client;
-
-    public UserCLI(MainCLI parent) {
-        super("user", "User management commands");
-        this.parent = parent;
-
-        addModule(new UserFindCLI(this));
-        addModule(new UserShowCLI(this));
-        addModule(new UserAddCLI(this));
-        addModule(new UserModifyCLI(this));
-        addModule(new UserRemoveCLI(this));
-
-        addModule(new UserFindCertCLI(this));
-        addModule(new UserShowCertCLI(this));
-        addModule(new UserAddCertCLI(this));
-        addModule(new UserRemoveCertCLI(this));
-    }
-
-    public void printHelp() {
-
-        System.out.println("Commands:");
-
-        int leftPadding = 1;
-        int rightPadding = 25;
-
-        for (CLI module : modules.values()) {
-            String label = name + "-" + module.getName();
-
-            int padding = rightPadding - leftPadding - label.length();
-            if (padding < 1)
-                padding = 1;
-
-            System.out.print(StringUtils.repeat(" ", leftPadding));
-            System.out.print(label);
-            System.out.print(StringUtils.repeat(" ", padding));
-            System.out.println(module.getDescription());
-        }
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        client = new UserClient(parent.config);
-        client.setVerbose(verbose);
-
-        if (args.length == 0) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String command = args[0];
-        String[] commandArgs = Arrays.copyOfRange(args, 1, args.length);
-
-        if (command == null) {
-            printHelp();
-            System.exit(1);
-        }
-
-        CLI module = getModule(command);
-        if (module != null) {
-            module.execute(commandArgs);
-
-        } else {
-            System.err.println("Error: Invalid command \"" + command + "\"");
-            printHelp();
-            System.exit(1);
-        }
-    }
-
-    public static void printUser(UserData userData) {
-        System.out.println("  User ID: " + userData.getID());
-
-        String fullName = userData.getFullName();
-        if (!StringUtils.isEmpty(fullName))
-            System.out.println("  Full name: " + fullName);
-
-        String email = userData.getEmail();
-        if (!StringUtils.isEmpty(email))
-            System.out.println("  Email: " + email);
-
-        String phone = userData.getPhone();
-        if (!StringUtils.isEmpty(phone))
-            System.out.println("  Phone: " + phone);
-
-        String type = userData.getType();
-        if (!StringUtils.isEmpty(type))
-            System.out.println("  Type: " + type);
-
-        String state = userData.getState();
-        if (!StringUtils.isEmpty(state))
-            System.out.println("  State: " + state);
-
-        Link link = userData.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-    }
-
-    public static void printCert(
-            UserCertData userCertData,
-            boolean showPrettyPrint,
-            boolean showEncoded) {
-
-        System.out.println("  Cert ID: " + userCertData.getID());
-        System.out.println("  Version: " + userCertData.getVersion());
-        System.out.println("  Serial Number: " + userCertData.getSerialNumber().toHexString());
-        System.out.println("  Issuer: " + userCertData.getIssuerDN());
-        System.out.println("  Subject: " + userCertData.getSubjectDN());
-
-        Link link = userCertData.getLink();
-        if (verbose && link != null) {
-            System.out.println("  Link: " + link.getHref());
-        }
-
-        String prettyPrint = userCertData.getPrettyPrint();
-        if (showPrettyPrint && prettyPrint != null) {
-            System.out.println();
-            System.out.println(prettyPrint);
-        }
-
-        String encoded = userCertData.getEncoded();
-        if (showEncoded && encoded != null) {
-            System.out.println();
-            System.out.println(encoded);
-        }
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserClient.java b/base/common/src/com/netscape/cms/client/user/UserClient.java
deleted file mode 100644
index 010468e8a..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserClient.java
+++ /dev/null
@@ -1,89 +0,0 @@
-//--- BEGIN COPYRIGHT BLOCK ---
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
-//
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-//
-//You should have received a copy of the GNU General Public License along
-//with this program; if not, write to the Free Software Foundation, Inc.,
-//51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-//(C) 2012 Red Hat, Inc.
-//All rights reserved.
-//--- END COPYRIGHT BLOCK ---
-package com.netscape.cms.client.user;
-
-import java.net.URISyntaxException;
-
-import org.jboss.resteasy.client.ClientResponse;
-
-import com.netscape.certsrv.user.UserCertCollection;
-import com.netscape.certsrv.user.UserCertData;
-import com.netscape.certsrv.user.UserCertResource;
-import com.netscape.certsrv.user.UserCollection;
-import com.netscape.certsrv.user.UserData;
-import com.netscape.certsrv.user.UserResource;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.PKIClient;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserClient extends PKIClient {
-
-    public UserResource userClient;
-    public UserCertResource userCertClient;
-
-    public UserClient(ClientConfig config) throws URISyntaxException {
-        super(config);
-
-        userClient = createProxy(UserResource.class);
-        userCertClient = createProxy(UserCertResource.class);
-    }
-
-    public UserCollection findUsers(String filter, Integer start, Integer size) {
-        return userClient.findUsers(filter, start, size);
-    }
-
-    public UserData getUser(String userID) {
-        return userClient.getUser(userID);
-    }
-
-    public UserData addUser(UserData userData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<UserData> response = (ClientResponse<UserData>)userClient.addUser(userData);
-        return getEntity(response);
-    }
-
-    public UserData modifyUser(String userID, UserData userData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<UserData> response = (ClientResponse<UserData>)userClient.modifyUser(userID, userData);
-        return getEntity(response);
-    }
-
-    public void removeUser(String userID) {
-        userClient.removeUser(userID);
-    }
-
-    public UserCertCollection findUserCerts(String userID, Integer start, Integer size) {
-        return userCertClient.findUserCerts(userID, start, size);
-    }
-
-    public UserCertData getUserCert(String userID, String certID) {
-        return userCertClient.getUserCert(userID, certID);
-    }
-
-    public UserCertData addUserCert(String userID, UserCertData userCertData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<UserCertData> response = (ClientResponse<UserCertData>)userCertClient.addUserCert(userID, userCertData);
-        return getEntity(response);
-    }
-
-    public void removeUserCert(String userID, String certID) {
-        userCertClient.removeUserCert(userID, certID);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserFindCLI.java b/base/common/src/com/netscape/cms/client/user/UserFindCLI.java
deleted file mode 100644
index c40149872..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserFindCLI.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.util.Collection;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserCollection;
-import com.netscape.certsrv.user.UserData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserFindCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserFindCLI(UserCLI parent) {
-        super("find", "Find users");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " [FILTER] [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "start", true, "Page start");
-        option.setArgName("start");
-        options.addOption(option);
-
-        option = new Option(null, "size", true, "Page size");
-        option.setArgName("size");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();;
-        String filter = cmdArgs.length > 0 ? cmdArgs[0] : null;
-
-        String s = cmd.getOptionValue("start");
-        Integer start = s == null ? null : Integer.valueOf(s);
-
-        s = cmd.getOptionValue("size");
-        Integer size = s == null ? null : Integer.valueOf(s);
-
-        UserCollection response = parent.client.findUsers(filter, start, size);
-
-        Collection<UserData> entries = response.getUsers();
-
-        MainCLI.printMessage(entries.size() + " user(s) matched");
-
-        boolean first = true;
-
-        for (UserData userData : entries) {
-
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-
-            UserCLI.printUser(userData);
-        }
-
-        MainCLI.printMessage("Number of entries returned " + entries.size());
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java
deleted file mode 100644
index c06d21faf..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserFindCertCLI.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.util.Collection;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserCertCollection;
-import com.netscape.certsrv.user.UserCertData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserFindCertCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserFindCertCLI(UserCLI parent) {
-        super("find-cert", "Find user certs");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "start", true, "Page start");
-        option.setArgName("start");
-        options.addOption(option);
-
-        option = new Option(null, "size", true, "Page size");
-        option.setArgName("size");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userID = cmdArgs[0];
-
-        String s = cmd.getOptionValue("start");
-        Integer start = s == null ? null : Integer.valueOf(s);
-
-        s = cmd.getOptionValue("size");
-        Integer size = s == null ? null : Integer.valueOf(s);
-
-        UserCertCollection response = parent.client.findUserCerts(userID, start, size);
-
-        Collection<UserCertData> entries = response.getCerts();
-
-        MainCLI.printMessage(entries.size() + " user cert(s) matched");
-
-        boolean first = true;
-
-        for (UserCertData userCertData : entries) {
-
-            if (first) {
-                first = false;
-            } else {
-                System.out.println();
-            }
-
-            UserCLI.printCert(userCertData, false, false);
-        }
-
-        MainCLI.printMessage("Number of entries returned " + entries.size());
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserModifyCLI.java b/base/common/src/com/netscape/cms/client/user/UserModifyCLI.java
deleted file mode 100644
index 2eca31f01..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserModifyCLI.java
+++ /dev/null
@@ -1,107 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserModifyCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserModifyCLI(UserCLI parent) {
-        super("mod", "Modify user");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "fullName", true, "Full name");
-        option.setArgName("fullName");
-        options.addOption(option);
-
-        option = new Option(null, "email", true, "Email");
-        option.setArgName("email");
-        options.addOption(option);
-
-        option = new Option(null, "password", true, "Password");
-        option.setArgName("password");
-        options.addOption(option);
-
-        option = new Option(null, "phone", true, "Phone");
-        option.setArgName("phone");
-        options.addOption(option);
-
-        // type cannot be modified
-        // option = new Option(null, "type", true, "Type");
-        // option.setArgName("type");
-        // options.addOption(option);
-
-        option = new Option(null, "state", true, "State");
-        option.setArgName("state");
-        options.addOption(option);
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userId = cmdArgs[0];
-
-        UserData userData = new UserData();
-        userData.setID(userId);
-        userData.setFullName(cmd.getOptionValue("fullName"));
-        userData.setEmail(cmd.getOptionValue("email"));
-        userData.setPassword(cmd.getOptionValue("password"));
-        userData.setPhone(cmd.getOptionValue("phone"));
-        // type cannot be modified
-        // userData.setType(cmd.getOptionValue("type"));
-        userData.setState(cmd.getOptionValue("state"));
-
-        userData = parent.client.modifyUser(userId, userData);
-
-        MainCLI.printMessage("Modified user \"" + userId + "\"");
-
-        UserCLI.printUser(userData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java b/base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java
deleted file mode 100644
index 6c367ec48..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserRemoveCLI.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserRemoveCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserRemoveCLI(UserCLI parent) {
-        super("del", "Remove user");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userID = args[0];
-
-        parent.client.removeUser(userID);
-
-        MainCLI.printMessage("Deleted user \"" + userID + "\"");
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java
deleted file mode 100644
index 096e46d64..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserRemoveCertCLI.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.net.URLEncoder;
-
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-
-/**
- * @author Endi S. Dewata
- */
-public class UserRemoveCertCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserRemoveCertCLI(UserCLI parent) {
-        super("remove-cert", "Remove user cert");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> <Cert ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 2) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userID = args[0];
-        String certID = args[1];
-
-        if (verbose) {
-            System.out.println("Removing cert "+certID+" from user "+userID+".");
-        }
-
-        parent.client.removeUserCert(userID, URLEncoder.encode(certID, "UTF-8"));
-
-        MainCLI.printMessage("Deleted certificate \"" + certID + "\"");
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java b/base/common/src/com/netscape/cms/client/user/UserShowCLI.java
deleted file mode 100644
index d46c5578c..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserShowCLI.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import com.netscape.certsrv.user.UserData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserShowCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserShowCLI(UserCLI parent) {
-        super("show", "Show user");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        if (args.length != 1) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userId = args[0];
-
-        UserData userData = parent.client.getUser(userId);
-
-        MainCLI.printMessage("User \"" + userId + "\"");
-
-        UserCLI.printUser(userData);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java b/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java
deleted file mode 100644
index 99bc55af0..000000000
--- a/base/common/src/com/netscape/cms/client/user/UserShowCertCLI.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2012 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-package com.netscape.cms.client.user;
-
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.net.URLEncoder;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import com.netscape.certsrv.user.UserCertData;
-import com.netscape.cms.client.cli.CLI;
-import com.netscape.cms.client.cli.MainCLI;
-
-/**
- * @author Endi S. Dewata
- */
-public class UserShowCertCLI extends CLI {
-
-    public UserCLI parent;
-
-    public UserShowCertCLI(UserCLI parent) {
-        super("show-cert", "Show user cert");
-        this.parent = parent;
-    }
-
-    public void printHelp() {
-        formatter.printHelp(parent.name + "-" + name + " <User ID> <Cert ID> [OPTIONS...]", options);
-    }
-
-    public void execute(String[] args) throws Exception {
-
-        Option option = new Option(null, "output", true, "Output file");
-        option.setArgName("file");
-        options.addOption(option);
-
-        options.addOption(null, "pretty", false, "Pretty print");
-        options.addOption(null, "encoded", false, "Base-64 encoded");
-
-        CommandLine cmd = null;
-
-        try {
-            cmd = parser.parse(options, args);
-
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            printHelp();
-            System.exit(1);
-        }
-
-        boolean showPrettyPrint = cmd.hasOption("pretty");
-        boolean showEncoded = cmd.hasOption("encoded");
-
-        String[] cmdArgs = cmd.getArgs();
-
-        if (cmdArgs.length != 2) {
-            printHelp();
-            System.exit(1);
-        }
-
-        String userID = cmdArgs[0];
-        String certID = cmdArgs[1];
-        String file = cmd.getOptionValue("output");
-
-        UserCertData userCertData = parent.client.getUserCert(userID, URLEncoder.encode(certID, "UTF-8"));
-
-        String encoded = userCertData.getEncoded();
-        if (encoded != null && file != null) {
-            // store cert to file
-            PrintWriter out = new PrintWriter(new FileWriter(file));
-            out.print(encoded);
-            out.close();
-        }
-
-        MainCLI.printMessage("Certificate \"" + userCertData.getID() + "\"");
-
-        UserCLI.printCert(userCertData, showPrettyPrint, showEncoded);
-    }
-}
diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
index bd84f1141..8c2d8d9b9 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertService.java
@@ -27,7 +27,7 @@ import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.cert.CertData;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.security.ITransportKeyUnit;
-import com.netscape.certsrv.system.SystemCertificateResource;
+import com.netscape.certsrv.system.SystemCertResource;
 import com.netscape.cms.servlet.base.PKIService;
 
 /**
@@ -36,7 +36,7 @@ import com.netscape.cms.servlet.base.PKIService;
  * @author alee
  *
  */
-public class SystemCertService extends PKIService implements SystemCertificateResource {
+public class SystemCertService extends PKIService implements SystemCertResource {
 
     /**
      * Used to retrieve the transport certificate
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index 4397251b5..d63a35b31 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -135,6 +135,7 @@ import com.netscape.certsrv.base.EPropertyNotFound;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISubsystem;
 import com.netscape.certsrv.ca.ICertificateAuthority;
+import com.netscape.certsrv.client.ClientConfig;
 import com.netscape.certsrv.dbs.IDBSubsystem;
 import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord;
 import com.netscape.certsrv.ldap.ILdapConnFactory;
@@ -142,11 +143,10 @@ import com.netscape.certsrv.ocsp.IDefStore;
 import com.netscape.certsrv.ocsp.IOCSPAuthority;
 import com.netscape.certsrv.system.InstallToken;
 import com.netscape.certsrv.system.InstallTokenRequest;
+import com.netscape.certsrv.system.SystemConfigClient;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.certsrv.usrgrp.IUser;
-import com.netscape.cms.client.ClientConfig;
-import com.netscape.cms.client.system.SystemConfigClient;
 import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.http.HttpClient;
 import com.netscape.cmsutil.http.HttpRequest;