Renamed base/deploy to base/server.

The base/deploy folder has been renamed to base/server to match the
package name. The pki.conf has been moved into pki-base package.

Ticket #553, #564

39 files changed, 12 insertions, 8 deletions

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index f646cfb60..0a8e51647 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -9,7 +9,7 @@ if (APPLICATION_FLAVOR_PKI_CORE)
     add_subdirectory(common)
     add_subdirectory(native-tools)
     add_subdirectory(java-tools)
-    add_subdirectory(deploy)
+    add_subdirectory(server)
     if(BUILD_PKI_SELINUX)
         add_subdirectory(selinux)
     endif(BUILD_PKI_SELINUX)
diff --git a/base/deploy/CMakeLists.txt b/base/server/CMakeLists.txt
index 9c2b7f942..1f638dc95 100644
--- a/base/deploy/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(deploy)
+project(server)
 
 set(PKI_SUBSYSTEMS
     ca
diff --git a/base/deploy/LICENSE b/base/server/LICENSE
index e281f4362..e281f4362 100644
--- a/base/deploy/LICENSE
+++ b/base/server/LICENSE
diff --git a/base/deploy/config/pkislots.cfg b/base/server/config/pkislots.cfg
index 1cb463bfe..1cb463bfe 100644
--- a/base/deploy/config/pkislots.cfg
+++ b/base/server/config/pkislots.cfg
diff --git a/base/deploy/config/sample.cfg b/base/server/config/sample.cfg
index d2334c754..d2334c754 100644
--- a/base/deploy/config/sample.cfg
+++ b/base/server/config/sample.cfg
diff --git a/base/deploy/config/sampleCAclone.cfg b/base/server/config/sampleCAclone.cfg
index 0aef7b25a..0aef7b25a 100644
--- a/base/deploy/config/sampleCAclone.cfg
+++ b/base/server/config/sampleCAclone.cfg
diff --git a/base/deploy/config/sampleExternalSignedCA-step1.cfg b/base/server/config/sampleExternalSignedCA-step1.cfg
index 35b3d2460..35b3d2460 100644
--- a/base/deploy/config/sampleExternalSignedCA-step1.cfg
+++ b/base/server/config/sampleExternalSignedCA-step1.cfg
diff --git a/base/deploy/config/sampleExternalSignedCA-step2.cfg b/base/server/config/sampleExternalSignedCA-step2.cfg
index c106d63c0..c106d63c0 100644
--- a/base/deploy/config/sampleExternalSignedCA-step2.cfg
+++ b/base/server/config/sampleExternalSignedCA-step2.cfg
diff --git a/base/deploy/config/sampleKRA.cfg b/base/server/config/sampleKRA.cfg
index 8cdfb9fa0..8cdfb9fa0 100644
--- a/base/deploy/config/sampleKRA.cfg
+++ b/base/server/config/sampleKRA.cfg
diff --git a/base/deploy/config/sampleKRAclone.cfg b/base/server/config/sampleKRAclone.cfg
index 96025cf07..96025cf07 100644
--- a/base/deploy/config/sampleKRAclone.cfg
+++ b/base/server/config/sampleKRAclone.cfg
diff --git a/base/deploy/config/sampleSubordinateCA.cfg b/base/server/config/sampleSubordinateCA.cfg
index 8b616163a..8b616163a 100644
--- a/base/deploy/config/sampleSubordinateCA.cfg
+++ b/base/server/config/sampleSubordinateCA.cfg
diff --git a/base/deploy/etc/default.cfg b/base/server/etc/default.cfg
index e848363ab..e848363ab 100644
--- a/base/deploy/etc/default.cfg
+++ b/base/server/etc/default.cfg
diff --git a/base/deploy/etc/pki.conf b/base/server/etc/pki.conf
index 24decec52..24decec52 100644
--- a/base/deploy/etc/pki.conf
+++ b/base/server/etc/pki.conf
diff --git a/base/deploy/man/man5/pki_default.cfg.5 b/base/server/man/man5/pki_default.cfg.5
index ec2379a9f..ec2379a9f 100644
--- a/base/deploy/man/man5/pki_default.cfg.5
+++ b/base/server/man/man5/pki_default.cfg.5
diff --git a/base/deploy/man/man8/pkidestroy.8 b/base/server/man/man8/pkidestroy.8
index 407a915aa..407a915aa 100644
--- a/base/deploy/man/man8/pkidestroy.8
+++ b/base/server/man/man8/pkidestroy.8
diff --git a/base/deploy/man/man8/pkispawn.8 b/base/server/man/man8/pkispawn.8
index d3e980302..d3e980302 100644
--- a/base/deploy/man/man8/pkispawn.8
+++ b/base/server/man/man8/pkispawn.8
diff --git a/base/deploy/scripts/operations b/base/server/scripts/operations
index 50dd4e4fd..50dd4e4fd 100644
--- a/base/deploy/scripts/operations
+++ b/base/server/scripts/operations
diff --git a/base/deploy/scripts/pkidaemon b/base/server/scripts/pkidaemon
index 3e1d27a40..3e1d27a40 100755
--- a/base/deploy/scripts/pkidaemon
+++ b/base/server/scripts/pkidaemon
diff --git a/base/deploy/src/engine/pkiconfig.py b/base/server/src/engine/pkiconfig.py
index ad6c22251..ad6c22251 100644
--- a/base/deploy/src/engine/pkiconfig.py
+++ b/base/server/src/engine/pkiconfig.py
diff --git a/base/deploy/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py
index df71978ed..df71978ed 100644
--- a/base/deploy/src/engine/pkihelper.py
+++ b/base/server/src/engine/pkihelper.py
diff --git a/base/deploy/src/engine/pkilogging.py b/base/server/src/engine/pkilogging.py
index 319616145..319616145 100644
--- a/base/deploy/src/engine/pkilogging.py
+++ b/base/server/src/engine/pkilogging.py
diff --git a/base/deploy/src/engine/pkimanifest.py b/base/server/src/engine/pkimanifest.py
index 04a638f06..04a638f06 100644
--- a/base/deploy/src/engine/pkimanifest.py
+++ b/base/server/src/engine/pkimanifest.py
diff --git a/base/deploy/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py
index a6361dc8b..a6361dc8b 100644
--- a/base/deploy/src/engine/pkimessages.py
+++ b/base/server/src/engine/pkimessages.py
diff --git a/base/deploy/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py
index c4bf9b886..c4bf9b886 100644
--- a/base/deploy/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
diff --git a/base/deploy/src/engine/pkiscriptlet.py b/base/server/src/engine/pkiscriptlet.py
index 767b3c609..767b3c609 100644
--- a/base/deploy/src/engine/pkiscriptlet.py
+++ b/base/server/src/engine/pkiscriptlet.py
diff --git a/base/deploy/src/pkidestroy b/base/server/src/pkidestroy
index 4e23445f1..4e23445f1 100755
--- a/base/deploy/src/pkidestroy
+++ b/base/server/src/pkidestroy
diff --git a/base/deploy/src/pkispawn b/base/server/src/pkispawn
index 447240ecf..447240ecf 100755
--- a/base/deploy/src/pkispawn
+++ b/base/server/src/pkispawn
diff --git a/base/deploy/src/scriptlets/configuration.py b/base/server/src/scriptlets/configuration.py
index 7bd1b017a..7bd1b017a 100644
--- a/base/deploy/src/scriptlets/configuration.py
+++ b/base/server/src/scriptlets/configuration.py
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/server/src/scriptlets/finalization.py
index 6ddc98d03..6ddc98d03 100644
--- a/base/deploy/src/scriptlets/finalization.py
+++ b/base/server/src/scriptlets/finalization.py
diff --git a/base/deploy/src/scriptlets/infrastructure_layout.py b/base/server/src/scriptlets/infrastructure_layout.py
index 69a905849..69a905849 100644
--- a/base/deploy/src/scriptlets/infrastructure_layout.py
+++ b/base/server/src/scriptlets/infrastructure_layout.py
diff --git a/base/deploy/src/scriptlets/initialization.py b/base/server/src/scriptlets/initialization.py
index 3494ebdc7..3494ebdc7 100644
--- a/base/deploy/src/scriptlets/initialization.py
+++ b/base/server/src/scriptlets/initialization.py
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/server/src/scriptlets/instance_layout.py
index 843227a84..843227a84 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/server/src/scriptlets/instance_layout.py
diff --git a/base/deploy/src/scriptlets/security_databases.py b/base/server/src/scriptlets/security_databases.py
index 9ac4784e5..9ac4784e5 100644
--- a/base/deploy/src/scriptlets/security_databases.py
+++ b/base/server/src/scriptlets/security_databases.py
diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/server/src/scriptlets/selinux_setup.py
index 552ab3f41..552ab3f41 100644
--- a/base/deploy/src/scriptlets/selinux_setup.py
+++ b/base/server/src/scriptlets/selinux_setup.py
diff --git a/base/deploy/src/scriptlets/slot_substitution.py b/base/server/src/scriptlets/slot_substitution.py
index 205ed49f6..205ed49f6 100644
--- a/base/deploy/src/scriptlets/slot_substitution.py
+++ b/base/server/src/scriptlets/slot_substitution.py
diff --git a/base/deploy/src/scriptlets/subsystem_layout.py b/base/server/src/scriptlets/subsystem_layout.py
index c4c4c2283..c4c4c2283 100644
--- a/base/deploy/src/scriptlets/subsystem_layout.py
+++ b/base/server/src/scriptlets/subsystem_layout.py
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/server/src/scriptlets/webapp_deployment.py
index e72752ee8..e72752ee8 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/server/src/scriptlets/webapp_deployment.py
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index 74e872589..76a770430 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -39,7 +39,7 @@ PKI_CORE_VERSION="10.0.1"
 ##
 
 PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec"
-PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools deploy selinux ca kra ocsp tks silent"
+PKI_COMPONENT_LIST="test setup symkey util common native-tools java-tools server selinux ca kra ocsp tks silent"
 
 if [ "$JAVADOC" = "" ]; then
     PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST javadoc"
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 4bd4f0100..73c374d8e 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.0.1
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -810,6 +810,8 @@ fi
 %doc base/common/LICENSE
 %dir %{_datadir}/pki
 %{_datadir}/pki/VERSION
+%dir %{_sysconfdir}/pki
+%config(noreplace) %{_sysconfdir}/pki/pki.conf
 %dir %{_javadir}/pki
 %{_javadir}/pki/pki-cmsutil.jar
 %{_javadir}/pki/pki-nsutil.jar
@@ -857,9 +859,7 @@ fi
 %files -n pki-server
 %defattr(-,root,root,-)
 %doc base/common/THIRD_PARTY_LICENSES
-%doc base/deploy/LICENSE
-%dir %{_sysconfdir}/pki/
-%config(noreplace) %{_sysconfdir}/pki/pki.conf
+%doc base/server/LICENSE
 %{_sysconfdir}/pki/default.cfg
 %{_sbindir}/pkispawn
 %{_sbindir}/pkidestroy
@@ -902,7 +902,6 @@ fi
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
 
 %{_datadir}/pki/setup/
-%dir %{_datadir}/pki/server
 %{_datadir}/pki/server/
 
 %if ! 0%{?rhel} && 0%{?fedora} <= 17
@@ -1007,6 +1006,11 @@ fi
 
 
 %changelog
+* Fri Apr 5 2013 Endi S. Dewata <edewata@redhat.com> 10.0.1-9
+- Renamed base/deploy to base/server.
+- Moved pki.conf into pki-base.
+- Removed redundant pki/server folder declaration.
+
 * Tue Mar 19 2013 Ade Lee <alee@redhat.com> 10.0.1-8
 - Removed jython dependency