diff options
| author | Ade Lee <alee@redhat.com> | 2012-04-13 13:51:32 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-05-01 17:22:38 -0400 |
| commit | 80aff97bedf8c2ee5f58209f36f18ebbc475ccb1 (patch) | |
| tree | 7a4e6a79f0e29c0596c81aaef47009d66cb56ccf /base/setup | |
| parent | dd566ed3c64a69801a9edf3b27f11077aa40ecef (diff) | |
| download | pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.tar.gz pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.tar.xz pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.zip | |
RESTful servlet to configure system in a single servlet.
Installation code common to the panels and the installation servlet are extracted to a
ConfigurationUtils file. The panel code will be cleaned up to use the code in this
class in a later commit.
Contains restful client and test driver code. The test driver code should be modified
and placed in a junit/system test framework. Installation has been tested to work with
the following installations: master CA, clone CA, KRA, OCSP, TKS, subordinate CA, CA
signed by external CA (parts 1 and 2).
Ticket #155
Diffstat (limited to 'base/setup')
| -rwxr-xr-x | base/setup/pkicommon.pm | 5 | ||||
| -rwxr-xr-x | base/setup/pkicreate | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/base/setup/pkicommon.pm b/base/setup/pkicommon.pm index b96b9489c..b5ef8e140 100755 --- a/base/setup/pkicommon.pm +++ b/base/setup/pkicommon.pm @@ -185,6 +185,7 @@ our $default_modutil_command = undef; our $default_initscripts_path = undef; our $default_registry_path = undef; my $resteasy_path = "/usr/share/java/resteasy"; +my $httpcomponents_path = "/usr/share/java/httpcomponents"; our $default_dir_permissions = 00770; our $default_exe_permissions = 00770; @@ -220,7 +221,7 @@ if ($^O eq "linux") { $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; $default_system_jni_java_path = "/usr/lib/java"; - @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path, $resteasy_path); + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path, $resteasy_path, $httpcomponents_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -232,7 +233,7 @@ if ($^O eq "linux") { $default_x86_64_jni_java_path = "/usr/lib64/java"; $default_system_jni_java_path = "/usr/lib/java"; @default_jar_path = ($default_pki_java_path, $default_java_path, $default_x86_64_jni_java_path, - $default_system_jni_java_path, $resteasy_path); + $default_system_jni_java_path, $resteasy_path, $httpcomponents_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 19f268a00..b5453f2f6 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -203,6 +203,7 @@ my $apache_commons_lang_jar_base_name = "apache-commons-lang.jar"; my $jakarta_commons_lang_jar_base_name = "jakarta-commons-lang.jar"; my $xml_commons_apis_jar_base_name = "xml-commons-apis.jar"; my $xml_commons_resolver_jar_base_name = "xml-commons-resolver.jar"; +my $httpclient_jar_base_name = "httpclient.jar"; my $conf_base_name = "conf"; # CA, KRA, OCSP, TKS, my $catalina_properties_base_name = "catalina.properties"; # CA, KRA, OCSP, TKS @@ -494,6 +495,8 @@ my $commons_lang_jar_file_path = undef; # CA, KRA, OCSP, TKS my $commons_lang_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $commons_logging_jar_file_path = undef; # CA, KRA, OCSP, TKS my $commons_logging_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $httpclient_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $httpclient_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $jss_jar_file_path = undef; # CA, KRA, OCSP, TKS my $jss_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $ldapjdk_jar_file_path = undef; # CA, KRA, OCSP, TKS @@ -1890,6 +1893,11 @@ sub initialize_subdirectory_paths return 0; } + if (!defined($httpclient_jar_file_path = find_jar($httpclient_jar_base_name))) { + emit("could not find jar: $httpclient_jar_base_name", "error"); + return 0; + } + if (!defined($jettison_jar_file_path = find_jar($jettison_jar_base_name))) { emit("could not find jar: $jettison_jar_base_name", "error"); return 0; @@ -1963,7 +1971,8 @@ sub initialize_subdirectory_paths . "/" . $resteasy_jettison_provider_jar_base_name; $jettison_jar_symlink_path = $webinf_lib_instance_path . "/" . $jettison_jar_base_name; - + $httpclient_jar_symlink_path = $webinf_lib_instance_path + . "/" . $httpclient_jar_base_name; $webapps_root_instance_path = $webapps_instance_path . "/" @@ -3000,6 +3009,9 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($jettison_jar_symlink_path, $jettison_jar_file_path, $pki_user, $pki_group); + # create instance symlink to "httpclient.jar" + return 0 if !create_symlink($httpclient_jar_symlink_path, $httpclient_jar_file_path, + $pki_user, $pki_group); } |