java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 4 +++ java/code/src/com/redhat/rhn/manager/channel/RepoLister.java | 13 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)
New commits: commit 6907bfcc8f59c5087de20e4a419e40328a4d5d31 Author: Shannon Hughes shughes@redhat.com Date: Wed May 12 23:42:33 2010 -0400
setting up ContentSource queries
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 b17bed7..cf13f25 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 @@ -40,4 +40,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <![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> + </hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java b/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java index d81d188..0d5c9a4 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java +++ b/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java @@ -17,7 +17,9 @@ package com.redhat.rhn.manager.channel; import java.util.LinkedList; import java.util.List;
+import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.ContentSource; +import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.BaseManager;
@@ -42,10 +44,19 @@ public class RepoLister extends BaseManager { public static RepoLister getInstance() { return INSTANCE; } + + public DataResult<ContentSource> sourcesInOrg(Org orgIn) { + + //need to determine if we want to use Hibernate or DataSource query here + DataResult<ContentSource> returnDataResult = null; + + return returnDataResult; + }
public List<ContentSource> list(User user) { - List <ContentSource> repos = new LinkedList<ContentSource>(); + List <ContentSource> repos = new LinkedList<ContentSource>(); + repos.addAll(sourcesInOrg(user.getOrg())); return repos; } }
spacewalk-commits@lists.fedorahosted.org