diff options
| -rw-r--r-- | .classpath | 28 | ||||
| -rw-r--r-- | base/common/src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | base/deploy/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | base/setup/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar | bin | 32378 -> 0 bytes | |||
| -rwxr-xr-x | base/setup/pkicommon.pm | 6 | ||||
| -rwxr-xr-x | base/setup/pkicreate | 12 | ||||
| -rw-r--r-- | specs/pki-core.spec | 13 |
8 files changed, 36 insertions, 53 deletions
diff --git a/.classpath b/.classpath index cfec8626d..611309f73 100644 --- a/.classpath +++ b/.classpath @@ -15,24 +15,26 @@ <classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/silent/src"/> <classpathentry kind="src" path="base/kra/functional/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/> + <classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/> + <classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/> + <classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/> <classpathentry kind="lib" path="/usr/share/java/idm-console-base.jar"/> - <classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/> + <classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/> <classpathentry kind="lib" path="/usr/share/java/idm-console-nmclf.jar"/> + <classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/> <classpathentry kind="lib" path="/usr/lib64/java/jss4.jar"/> - <classpathentry kind="lib" path="/usr/share/java/velocity.jar"/> + <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/> + <classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/> + <classpathentry kind="lib" path="/usr/share/java/glassfish-jaxb/jaxb-impl.jar"/> + <classpathentry kind="lib" path="/usr/share/java/resteasy/jaxrs-api.jar"/> + <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxb-provider.jar"/> + <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxrs.jar"/> + <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jettison-provider.jar"/> + <classpathentry kind="lib" path="/usr/share/java/scannotation.jar"/> <classpathentry kind="lib" path="/usr/share/java/servlet.jar"/> + <classpathentry kind="lib" path="/usr/share/java/velocity.jar"/> <classpathentry kind="lib" path="/usr/share/java/xerces-j2.jar"/> - <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/> - <classpathentry kind="lib" path="/usr/share/candlepin/lib/jaxrs-api-2.2.1.GA.jar"/> - <classpathentry kind="lib" path="/usr/share/candlepin/lib/resteasy-jaxrs-2.2.1.GA.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/> - <classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/> - <classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/> - <classpathentry kind="lib" path="/usr/share/candlepin/lib/jaxb-impl-2.1.12.jar"/> - <classpathentry kind="lib" path="/usr/share/candlepin/lib/resteasy-jaxb-provider-2.2.1.GA.jar"/> - <classpathentry kind="lib" path="/usr/share/tomcat6/lib/catalina.jar"/> <classpathentry kind="lib" path="/usr/share/java/xml-commons-apis.jar"/> + <classpathentry kind="lib" path="/usr/share/tomcat6/lib/catalina.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt index 7a7c38a44..01ff33e47 100644 --- a/base/common/src/CMakeLists.txt +++ b/base/common/src/CMakeLists.txt @@ -64,16 +64,16 @@ find_file(XERCES_JAR find_file(JAXRS_API_JAR NAMES - jaxrs-api-2.2.1.GA.jar + jaxrs-api.jar PATHS - /usr/share/candlepin/lib + /usr/share/java/resteasy ) find_file(RESTEASY_JAXRS_JAR NAMES - resteasy-jaxrs-2.2.1.GA.jar + resteasy-jaxrs.jar PATHS - /usr/share/candlepin/lib + /usr/share/java/resteasy ) set(pki-certsrv_java_SRCS diff --git a/base/deploy/CMakeLists.txt b/base/deploy/CMakeLists.txt index 11d70c55d..65c3eacc0 100644 --- a/base/deploy/CMakeLists.txt +++ b/base/deploy/CMakeLists.txt @@ -63,17 +63,6 @@ install( \"\$ENV{DESTDIR}${PYTHON_SITE_PACKAGES}/pki/deployment/__init__.py\")" ) -#install( -# FILES -# jars/resteasy-jettison-provider-2.3-RC1.jar -# DESTINATION -# ${JAVA_JAR_INSTALL_DIR} -# PERMISSIONS -# OWNER_EXECUTE OWNER_WRITE OWNER_READ -# GROUP_EXECUTE GROUP_READ -# WORLD_EXECUTE WORLD_READ -#) - # install empty directories #install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)") #install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)") diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index 2ed50ee62..05f18332d 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -27,17 +27,6 @@ install( WORLD_EXECUTE WORLD_READ ) -install( - FILES - jars/resteasy-jettison-provider-2.3-RC1.jar - DESTINATION - ${JAVA_JAR_INSTALL_DIR} - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ -) - # install empty directories install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)") install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)") diff --git a/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar b/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar Binary files differdeleted file mode 100644 index da7106ddd..000000000 --- a/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar +++ /dev/null diff --git a/base/setup/pkicommon.pm b/base/setup/pkicommon.pm index 6ce255303..b96b9489c 100755 --- a/base/setup/pkicommon.pm +++ b/base/setup/pkicommon.pm @@ -184,7 +184,7 @@ our $default_ldapmodify_command = undef; our $default_modutil_command = undef; our $default_initscripts_path = undef; our $default_registry_path = undef; -my $candlepin_java_path = "/usr/share/candlepin/lib"; +my $resteasy_path = "/usr/share/java/resteasy"; our $default_dir_permissions = 00770; our $default_exe_permissions = 00770; @@ -220,7 +220,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, $candlepin_java_path); + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path, $resteasy_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -232,7 +232,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, $candlepin_java_path); + $default_system_jni_java_path, $resteasy_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; diff --git a/base/setup/pkicreate b/base/setup/pkicreate index edde86ecc..19f268a00 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -187,13 +187,13 @@ my $velocity_jar_base_name = "velocity.jar"; # CA, KRA, OCSP, TKS my $xerces_jar_base_name = "xerces-j2.jar"; # CA, KRA, OCSP, TKS # resteasy jars -my $javassist_jar_base_name = "javassist-3.9.0.GA.jar"; # CA, KRA, OCSP, TKS -my $jaxrs_api_jar_base_name = "jaxrs-api-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS -my $resteasy_jaxb_provider_jar_base_name = "resteasy-jaxb-provider-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS -my $resteasy_jaxrs_jar_base_name = "resteasy-jaxrs-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS -my $scannotation_jar_base_name = "scannotation-1.0.2.jar"; # CA, KRA, OCSP, TKS +my $javassist_jar_base_name = "javassist.jar"; # CA, KRA, OCSP, TKS +my $jaxrs_api_jar_base_name = "jaxrs-api.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxb_provider_jar_base_name = "resteasy-jaxb-provider.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxrs_jar_base_name = "resteasy-jaxrs.jar"; # CA, KRA, OCSP, TKS +my $scannotation_jar_base_name = "scannotation.jar"; # CA, KRA, OCSP, TKS my $jettison_jar_base_name = "jettison.jar"; # CA, KRA, OCSP, TKS -my $resteasy_jettison_provider_jar_base_name = "resteasy-jettison-provider-2.3-RC1.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jettison_provider_jar_base_name = "resteasy-jettison-provider.jar"; # CA, KRA, OCSP, TKS my $apache_commons_collections_jar_base_name = "apache-commons-collections.jar"; my $jakarta_commons_collections_jar_base_name = "jakarta-commons-collections.jar"; diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 329b84c4a..92b72396d 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.0.0 -Release: %{?relprefix}12%{?prerel}%{?dist} +Release: %{?relprefix}13%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -41,8 +41,8 @@ BuildRequires: selinux-policy-devel BuildRequires: velocity BuildRequires: xalan-j2 BuildRequires: xerces-j2 -BuildRequires: candlepin-deps >= 0.0.21-1 %if 0%{?fedora} >= 17 +BuildRequires: resteasy >= 2.3.2-1 BuildRequires: junit %else BuildRequires: junit4 @@ -337,7 +337,6 @@ Group: System Environment/Base BuildArch: noarch Requires: java >= 1:1.6.0 -Requires: candlepin-deps >= 0.0.21-1 Requires: javassist Requires: jettison Requires: pki-common-theme >= 9.0.0 @@ -352,6 +351,9 @@ Requires: %{_javadir}/xerces-j2.jar Requires: %{_javadir}/xml-commons-apis.jar Requires: %{_javadir}/xml-commons-resolver.jar Requires: velocity +%if 0%{?fedora} >= 17 +Requires: resteasy >= 2.3.2-1 +%endif %if 0%{?fedora} >= 16 Requires: apache-commons-lang Requires: apache-commons-logging @@ -1076,7 +1078,6 @@ fi #%if 0%{?fedora} >= 16 #%{_bindir}/pkicontrol #%endif -#%{_javadir}/resteasy-jettison-provider-2.3-RC1.jar %files -n pki-setup @@ -1095,7 +1096,6 @@ fi %if 0%{?fedora} >= 16 %{_bindir}/pkicontrol %endif -%{_javadir}/resteasy-jettison-provider-2.3-RC1.jar %files -n pki-symkey @@ -1324,6 +1324,9 @@ fi %changelog +* Fri Mar 27 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.13.a1 +- Replaced candlepin-deps with resteasy + * Fri Mar 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.12.a1 - Added option to build without Javadoc |