From be2c970d1aba4a441700a05bc1f7380fc7aedb7c Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Tue, 18 Dec 2012 12:14:31 -0500
Subject: Hardcode setting of resteasy-lib for instance

Tomcat in f17 expects the file under /etc/sysconfig/foo to be a
set of environment variables being set, and parses it that way.
We recently added some logic to source the global pki.conf file.
This works in f18, but breaks instance startup in f17.

While this works in f18, its an indication that we are using the
tomcat config file incorrectly.  Reverting to hardcoding resteasy lib.
---
 base/deploy/src/scriptlets/pkiparser.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'base/deploy/src')

diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 8f351ac55..e4a6aed85 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -562,6 +562,8 @@ class PKIConfigParser:
                         "<!--"
                 config.pki_master_dict['PKI_TMPDIR_SLOT'] =\
                     config.pki_master_dict['pki_tomcat_tmpdir_path']
+                config.pki_master_dict['PKI_RESTEASY_LIB_SLOT'] =\
+                    config.pki_master_dict['resteasy_lib']
                 config.pki_master_dict['PKI_RANDOM_NUMBER_SLOT'] =\
                     config.pki_master_dict['pki_one_time_pin']
                 config.pki_master_dict['PKI_SECURE_PORT_SLOT'] =\
-- 
cgit