java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 6 +-----
java/code/webapp/WEB-INF/struts-config.xml | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit e96d62125339eb520ec44c823980728203fc056a
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu May 13 15:56:00 2010 -0400
minor tweaks to struts url path and hibernate fix
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
index cf13f25..351cf66 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
@@ -38,10 +38,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="ContentSource.findById">
<![CDATA[from com.redhat.rhn.domain.channel.ContentSource as c where c.id =
:id]]>
- </query>
-
- <query name="ContentSource.findByOrg">
- <![CDATA[from com.redhat.rhn.domain.channel.ContentSource as c where c.org_id
= :orgId]]>
- </query>
+ </query>
</hibernate-mapping>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index d948142..c76b65d 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6598,11 +6598,11 @@
<action path="/channels/manage/repos/RepoList"
scope="request"
parameter="all"
- input="/WEB-INF/pages/channels/manage/repo/repos.jsp"
+ input="/WEB-INF/pages/channel/manage/repo/repos.jsp"
type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoListSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<forward name="default"
- path="/WEB-INF/pages/channels/manage/repo/repos.jsp"/>
+ path="/WEB-INF/pages/channel/manage/repo/repos.jsp"/>
</action>
<!-- end repo -->
Show replies by date