modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 5 ++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 2 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit d1b6b454eb2a451e7c3e72a9b0a603854f0897ae Author: Pradeep Kilambi pkilambi@redhat.com Date: Mon Feb 1 16:49:49 2010 -0500
fixing the cyclic dependency issue between beans and exposing a call for reuse
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index 9395355..550239e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -46,6 +46,7 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
+import org.jboss.annotation.IgnoreDependency; import org.jboss.annotation.ejb.TransactionTimeout;
import org.rhq.core.clientapi.agent.PluginContainerException; @@ -134,8 +135,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe @EJB private ResourceTypeManagerLocal resourceTypeManager;
+ @IgnoreDependency @EJB - private ContentSourceManagerBean contentSourceManager; + private ContentSourceManagerLocal contentSourceManager;
// ContentManagerLocal Implementation --------------------------------------------
@@ -1612,4 +1614,5 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
return result; } + } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java index e08531e..c1ad1d3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java @@ -2074,7 +2074,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { return distBitsFile; }
- File getPackageBitsLocalFileAndCreateParentDir(int packageVersionId, String fileName) throws Exception { + public File getPackageBitsLocalFileAndCreateParentDir(int packageVersionId, String fileName) throws Exception {
File packageBitsFile = getPackageBitsLocalFilesystemFile(packageVersionId, fileName); File parentDir = packageBitsFile.getParentFile(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java index 4ff85fe..6471f9b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.server.content;
+import java.io.File; import java.io.OutputStream; import java.util.Collection; import java.util.List; @@ -622,4 +623,6 @@ public interface ContentSourceManagerLocal { * the given object are not valid */ ContentSource simpleCreateContentSource(Subject subject, ContentSource contentSource) throws ContentSourceException; + + File getPackageBitsLocalFileAndCreateParentDir(int packageVersionId, String fileName) throws Exception; } \ No newline at end of file
rhq-commits@lists.fedorahosted.org