search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
| 6 +++---
search-server/spacewalk-search/src/config/rhn-search
| 3 ++-
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
| 2 ++
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/HibernateToSearchTranslator.java
| 6 ++----
search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
| 6 ++++++
5 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 1a00594f47f4d88ad80da73457386c21c6e3ef2b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jul 28 18:14:38 2010 +0200
build ConnectionURL from db_* values in rhn.conf
diff --git
a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
index a41e673..4038c8b 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
@@ -22,9 +22,9 @@
<transactionManager type="JDBC" >
<dataSource type="SIMPLE">
<property name="JDBC.Driver"
value="${search.connection.driver_class}"/>
- <property name="JDBC.ConnectionURL"
value="${search.connection.url}"/>
- <property name="JDBC.Username"
value="${search.connection.username}"/>
- <property name="JDBC.Password"
value="${search.connection.password}"/>
+ <property name="JDBC.ConnectionURL"
value="${search.connection.driver_proto}:@${db_name}"/>
+ <property name="JDBC.Username" value="${db_user}"/>
+ <property name="JDBC.Password" value="${db_password}"/>
</dataSource>
</transactionManager>
<!-- Identify all SQL Map XML files to be loaded by this SQL map. Notice the paths
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/HibernateToSearchTranslator.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/HibernateToSearchTranslator.java
index c8dc077..d55646c 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/HibernateToSearchTranslator.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/HibernateToSearchTranslator.java
@@ -34,9 +34,7 @@ public class HibernateToSearchTranslator implements KeyTranslator {
* {@inheritDoc}
*/
public boolean shouldTranslate(String key) {
- return (key.equals("hibernate.connection.username") ||
- key.equals("hibernate.connection.password") ||
- key.equals("hibernate.connection.driver_class") ||
- key.equals("hibernate.connection.url"));
+ return (key.equals("hibernate.connection.driver_class") ||
+ key.equals("hibernate.connection.driver_proto"));
}
}
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
index f8d7d85..a538e76 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
@@ -60,6 +60,12 @@ public class DatabaseManager {
reader = new FileReader(configPath);
}
Properties overrides = config.getNamespaceProperties("search");
+
+ String[] options = {"db_name", "db_password",
"db_user"};
+ for (String option : options) {
+ overrides.setProperty(option, config.getString(option));
+ }
+
client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides);
}
commit babc0da8c8ebab16859f2cdca0461254c8b29fe7
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jul 28 16:54:58 2010 +0200
set java.library.path for search to be able to find oci library
diff --git a/search-server/spacewalk-search/src/config/rhn-search
b/search-server/spacewalk-search/src/config/rhn-search
index f7856b8..7819d30 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -75,8 +75,9 @@ unlock() {
}
removeindex() {
+
JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/10.2.0.4/client/lib:/usr/lib/oracle/10.2.0.4/client/lib64'
SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib
/usr/share/java/ojdbc14.jar`
- CLASSPATH=${SEARCH_CLASS_PATH} java com.redhat.satellite.search.DeleteIndexes
+ CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH
com.redhat.satellite.search.DeleteIndexes
}
# Do not modify anything beyond this point
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 07d7145..6ef1005 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
@@ -41,6 +41,8 @@
wrapper.java.classpath.20=/usr/share/rhn/search/lib/commons-httpclient-3.0.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/client/lib64
# Java Additional Parameters
#wrapper.java.additional.1=
Show replies by date