java/buildconf/builder/config/satellite/rhn.conf | 1 -
java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 678b550327f9da2c5f09c6a7eb2af50b4f0c947b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Apr 30 16:49:19 2009 -0400
changing junit tests to use joust
diff --git a/java/buildconf/builder/config/satellite/rhn.conf
b/java/buildconf/builder/config/satellite/rhn.conf
index 01eb764..06eb7a6 100644
--- a/java/buildconf/builder/config/satellite/rhn.conf
+++ b/java/buildconf/builder/config/satellite/rhn.conf
@@ -38,7 +38,6 @@ web.default_db=rhnsat/rhnsat@rhnsat
web.legacy_user_enabled = 1
web.legacy_save_enabled = 1
-#hibernate.connection.url=jdbc:log:oracle.jdbc.driver.OracleDriver:oracle:thin:@joust.rhndev.redhat.com:1521:rhnsat
hibernate.connection.url=jdbc:log:oracle.jdbc.driver.OracleDriver:oracle:thin:@joust.rhndev.redhat.com:1521:rhnsat
hibernate.connection.driver_class=net.rkbloom.logdriver.LogDriver
commit ff068a40e341ce3ea73ccfa7dd269430d8e50903
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Apr 30 16:49:38 2009 -0400
fixing unit test
diff --git a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
index a580dc5..aff608f 100644
--- a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
@@ -412,7 +412,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="Action.findDependentActions"><![CDATA[
- from Action a where a.prerequisite in (:action_ids)
+ from Action a where a.prerequisite.id in (:action_ids)
]]></query>
<sql-query
name="Action.findLastActionByServerIdAndActionTypeIdAndUserId">