Refactored SystemConfigService (part 9).

New subclasses of SystemConfigService have been added for each
subsystem to replace the base installer. Initially these classes
are blank, so they are identical to the base class. Later they will
store subsystem-specific installation code.

Ticket #890

10 files changed, 165 insertions, 10 deletions

diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java
index 2e193d5e1..ef8687cc0 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/CAApplication.java
@@ -14,7 +14,6 @@ import org.dogtagpki.server.rest.MessageFormatInterceptor;
 import org.dogtagpki.server.rest.SecurityDomainService;
 import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SystemCertService;
-import org.dogtagpki.server.rest.SystemConfigService;
 import org.dogtagpki.server.rest.UserService;
 
 import com.netscape.certsrv.apps.CMS;
@@ -36,7 +35,7 @@ public class CAApplication extends Application {
         classes.add(AuditService.class);
 
         // installer
-        classes.add(SystemConfigService.class);
+        classes.add(CAInstallerService.class);
 
         // certs and requests
         classes.add(CertService.class);
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CAInstallerService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CAInstallerService.java
new file mode 100644
index 000000000..7a1aa5a12
--- /dev/null
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/CAInstallerService.java
@@ -0,0 +1,32 @@
+// --- 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) 2014 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package org.dogtagpki.server.ca.rest;
+
+import org.dogtagpki.server.rest.SystemConfigService;
+
+import com.netscape.certsrv.base.EBaseException;
+
+/**
+ * @author alee
+ *
+ */
+public class CAInstallerService extends SystemConfigService {
+
+    public CAInstallerService() throws EBaseException {
+    }
+}
diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java
index c8dc553e2..4f598cb99 100644
--- a/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java
+++ b/base/kra/src/org/dogtagpki/server/kra/rest/KRAApplication.java
@@ -14,7 +14,6 @@ import org.dogtagpki.server.rest.MessageFormatInterceptor;
 import org.dogtagpki.server.rest.SecurityDomainService;
 import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SystemCertService;
-import org.dogtagpki.server.rest.SystemConfigService;
 import org.dogtagpki.server.rest.UserService;
 
 import com.netscape.certsrv.apps.CMS;
@@ -36,7 +35,7 @@ public class KRAApplication extends Application {
         classes.add(AuditService.class);
 
         // installer
-        classes.add(SystemConfigService.class);
+        classes.add(KRAInstallerService.class);
 
         // security domain
         IConfigStore cs = CMS.getConfigStore();
diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KRAInstallerService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KRAInstallerService.java
new file mode 100644
index 000000000..755a61e35
--- /dev/null
+++ b/base/kra/src/org/dogtagpki/server/kra/rest/KRAInstallerService.java
@@ -0,0 +1,32 @@
+// --- 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) 2014 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package org.dogtagpki.server.kra.rest;
+
+import org.dogtagpki.server.rest.SystemConfigService;
+
+import com.netscape.certsrv.base.EBaseException;
+
+/**
+ * @author alee
+ *
+ */
+public class KRAInstallerService extends SystemConfigService {
+
+    public KRAInstallerService() throws EBaseException {
+    }
+}
diff --git a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
index 688fec772..392d923f9 100644
--- a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
+++ b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
@@ -14,7 +14,6 @@ import org.dogtagpki.server.rest.MessageFormatInterceptor;
 import org.dogtagpki.server.rest.SecurityDomainService;
 import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SystemCertService;
-import org.dogtagpki.server.rest.SystemConfigService;
 import org.dogtagpki.server.rest.UserService;
 
 import com.netscape.certsrv.apps.CMS;
@@ -36,7 +35,7 @@ public class OCSPApplication extends Application {
         classes.add(AuditService.class);
 
         // installer
-        classes.add(SystemConfigService.class);
+        classes.add(OCSPInstallerService.class);
 
         // security domain
         IConfigStore cs = CMS.getConfigStore();
diff --git a/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPInstallerService.java b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPInstallerService.java
new file mode 100644
index 000000000..0ee5eb430
--- /dev/null
+++ b/base/ocsp/src/org/dogtagpki/server/ocsp/rest/OCSPInstallerService.java
@@ -0,0 +1,32 @@
+// --- 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) 2014 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package org.dogtagpki.server.ocsp.rest;
+
+import org.dogtagpki.server.rest.SystemConfigService;
+
+import com.netscape.certsrv.base.EBaseException;
+
+/**
+ * @author alee
+ *
+ */
+public class OCSPInstallerService extends SystemConfigService {
+
+    public OCSPInstallerService() throws EBaseException {
+    }
+}
diff --git a/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java
index f824f9088..20b10ca40 100644
--- a/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java
+++ b/base/tks/src/org/dogtagpki/server/tks/rest/TKSApplication.java
@@ -13,7 +13,6 @@ import org.dogtagpki.server.rest.GroupService;
 import org.dogtagpki.server.rest.MessageFormatInterceptor;
 import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SystemCertService;
-import org.dogtagpki.server.rest.SystemConfigService;
 import org.dogtagpki.server.rest.UserService;
 
 import com.netscape.certsrv.base.PKIException;
@@ -32,7 +31,7 @@ public class TKSApplication extends Application {
         classes.add(AuditService.class);
 
         // installer
-        classes.add(SystemConfigService.class);
+        classes.add(TKSInstallerService.class);
 
         // selftests
         classes.add(SelfTestService.class);
diff --git a/base/tks/src/org/dogtagpki/server/tks/rest/TKSInstallerService.java b/base/tks/src/org/dogtagpki/server/tks/rest/TKSInstallerService.java
new file mode 100644
index 000000000..03dcf9fe7
--- /dev/null
+++ b/base/tks/src/org/dogtagpki/server/tks/rest/TKSInstallerService.java
@@ -0,0 +1,32 @@
+// --- 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) 2014 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package org.dogtagpki.server.tks.rest;
+
+import org.dogtagpki.server.rest.SystemConfigService;
+
+import com.netscape.certsrv.base.EBaseException;
+
+/**
+ * @author alee
+ *
+ */
+public class TKSInstallerService extends SystemConfigService {
+
+    public TKSInstallerService() throws EBaseException {
+    }
+}
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java
index 7ecadb5a7..a8161d203 100644
--- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSApplication.java
@@ -30,7 +30,6 @@ import org.dogtagpki.server.rest.GroupService;
 import org.dogtagpki.server.rest.MessageFormatInterceptor;
 import org.dogtagpki.server.rest.SelfTestService;
 import org.dogtagpki.server.rest.SystemCertService;
-import org.dogtagpki.server.rest.SystemConfigService;
 import org.dogtagpki.server.rest.UserService;
 import org.dogtagpki.server.tps.config.ConfigService;
 
@@ -53,7 +52,7 @@ public class TPSApplication extends Application {
         classes.add(AuditService.class);
 
         // installer
-        classes.add(SystemConfigService.class);
+        classes.add(TPSInstallerService.class);
 
         // user and group management
         classes.add(GroupService.class);
diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java
new file mode 100644
index 000000000..ed29116e8
--- /dev/null
+++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java
@@ -0,0 +1,32 @@
+// --- 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) 2014 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package org.dogtagpki.server.tps.rest;
+
+import org.dogtagpki.server.rest.SystemConfigService;
+
+import com.netscape.certsrv.base.EBaseException;
+
+/**
+ * @author alee
+ *
+ */
+public class TPSInstallerService extends SystemConfigService  {
+
+    public TPSInstallerService() throws EBaseException {
+    }
+}