summaryrefslogtreecommitdiffstats
path: root/pki/scripts
diff options
context:
space:
mode:
authoradmiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-09-06 17:37:22 +0000
committeradmiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-09-06 17:37:22 +0000
commitcf9933d5ff4eca347861350d18b2ffec15beeb01 (patch)
tree26642c31a323f437c3e7921fee5a5a196593ee59 /pki/scripts
parent0e7f1054dfe2102bf752c5281f8263d091c456cf (diff)
downloadpki-cf9933d5ff4eca347861350d18b2ffec15beeb01.tar.gz
pki-cf9933d5ff4eca347861350d18b2ffec15beeb01.tar.xz
pki-cf9933d5ff4eca347861350d18b2ffec15beeb01.zip
sync config
removing duplicated configuration the config file tree was duplicated, but the got out of sync. This patch synchronizes the key, prior to removing the duplicated code the java package: com.netscape.certsrv.common contains configuration information used by both the console and the server. It was copied in the source tree, and was getting duplicated. This removes the console version of the source, and instead copies the Java files prior to compilation git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2192 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/scripts')
-rwxr-xr-xpki/scripts/compose_pki_console_packages15
1 files changed, 13 insertions, 2 deletions
diff --git a/pki/scripts/compose_pki_console_packages b/pki/scripts/compose_pki_console_packages
index 2d656025c..2c69c958d 100755
--- a/pki/scripts/compose_pki_console_packages
+++ b/pki/scripts/compose_pki_console_packages
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
@@ -138,8 +138,19 @@ else
-name *.swp -prune -o \
-print | cpio -pdum ${PKI_CONSOLE_BASE_DIR} > /dev/null 2>&1
done
- cd - > /dev/null 2>&1
+ ##
+ ## Copy the configuration classes from the common tree
+ ##
+
+ find common/src/com/netscape/certsrv/common/ \
+ -name .svn -prune -o \
+ -name *.swp -prune -o \
+ -print | cpio -pdum ${PKI_CONSOLE_BASE_DIR} > /dev/null 2>&1
+
+ mv ${PKI_CONSOLE_BASE_DIR}/common/src/com/netscape/* \
+ ${PKI_CONSOLE_BASE_DIR}/console/src/com/netscape
+ cd - > /dev/null 2>&1
##
## Create the 'pki-console' tarball