java/conf/default/rhn_taskomatic_daemon.conf | 6 +++--- java/spacewalk-java.spec | 7 ------- search-server/spacewalk-search/src/config/rhn-search | 2 +- search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-)
New commits: commit 657e062d2fe2d54461f436e1adcee436cef327c1 Author: Tomas Lestach tlestach@redhat.com Date: Tue Jan 11 16:43:05 2011 +0100
change rhn-search library path to use oracle-instantclient11.x
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index 968242f..3384280 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -75,7 +75,7 @@ unlock() { }
removeindex() { - JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/10.2.0.4/client/lib:/usr/lib/oracle/10.2.0.4/client64/lib' + JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib' SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar` CLASSPATH=/usr/share/rhn/search/classes:${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes } diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 229bbe2..de49399 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -46,8 +46,8 @@ wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64 -wrapper.java.library.path.3=/usr/lib/oracle/10.2.0.4/client/lib -wrapper.java.library.path.4=/usr/lib/oracle/10.2.0.4/client64/lib +wrapper.java.library.path.3=/usr/lib/oracle/11.2/client/lib +wrapper.java.library.path.4=/usr/lib/oracle/11.2/client64/lib
# Java Additional Parameters #wrapper.java.additional.1=
commit 3c60450b8091780f646438bb0c0b4f5501437432 Author: Tomas Lestach tlestach@redhat.com Date: Tue Jan 11 16:20:10 2011 +0100
change taskomatic library path to use oracle-instantclient11.x
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf index b65845f..1738e66 100644 --- a/java/conf/default/rhn_taskomatic_daemon.conf +++ b/java/conf/default/rhn_taskomatic_daemon.conf @@ -18,8 +18,8 @@ wrapper.java.mainclass=com.redhat.rhn.taskomatic.core.TaskomaticDaemon # TODO need to make this work on AMD64 which would be /usr/lib64 wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64 -wrapper.java.library.path.3=/usr/lib/oracle/10.2.0.4/client64/lib -wrapper.java.library.path.4=/usr/lib/oracle/10.2.0.4/client/lib +wrapper.java.library.path.3=/usr/lib/oracle/11.2/client64/lib +wrapper.java.library.path.4=/usr/lib/oracle/11.2/client/lib
wrapper.java.classpath.1=/usr/share/java/tanukiwrapper.jar wrapper.java.classpath.2=/usr/share/rhn/classes
commit 85a5f8e999c1b63c217f6c84e26e10fae21a6887 Author: Tomas Lestach tlestach@redhat.com Date: Tue Jan 11 16:06:32 2011 +0100
removing spacewalk-asm.jar symlink
since both asm-1.5.3-1jpp.ep1.1.el5.2 and asm-1.5.3-7.jpp5.noarch contain /usr/share/java/asm/asm.jar, we can add to classpath directly asm.jar
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf index 6dda50d..b65845f 100644 --- a/java/conf/default/rhn_taskomatic_daemon.conf +++ b/java/conf/default/rhn_taskomatic_daemon.conf @@ -34,7 +34,7 @@ wrapper.java.classpath.10=/usr/share/java/commons-beanutils.jar wrapper.java.classpath.11=/usr/share/java/ojdbc14.jar wrapper.java.classpath.12=/usr/share/java/jta.jar wrapper.java.classpath.13=/usr/share/java/concurrent.jar -wrapper.java.classpath.14=/usr/share/rhn/lib/spacewalk-asm.jar +wrapper.java.classpath.14=/usr/share/java/asm/asm.jar wrapper.java.classpath.15=/usr/share/java/axis/jaxrpc.jar wrapper.java.classpath.16=/usr/share/java/commons-collections.jar wrapper.java.classpath.17=/usr/share/java/taglibs-standard.jar diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 437c8e2..0b02d96 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -345,12 +345,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{realcobsnippetsdir} ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT%{realcobsnippetsdir}/spacewalk touch $RPM_BUILD_ROOT%{_var}/spacewalk/systemlogs/audit-review.log
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13) -ln -s -f %{_javadir}/asm/asm.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib/spacewalk-asm.jar -%else -ln -s -f %{_javadir}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib/spacewalk-asm.jar -%endif - # delete JARs which must not be deployed rm -rf $RPM_BUILD_ROOT%{jardir}/jspapi.jar rm -rf $RPM_BUILD_ROOT%{jardir}/jasper5-compiler.jar @@ -498,7 +492,6 @@ fi %files -n spacewalk-taskomatic %attr(755, root, root) %{_initrddir}/taskomatic %attr(755, root, root) %{_bindir}/taskomaticd -%attr(755, root, root) %{_datadir}/rhn/lib/spacewalk-asm.jar
%files config
spacewalk-commits@lists.fedorahosted.org