.classpath
| 1
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java
| 21 +------
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
| 28 +++-------
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
| 20 +------
4 files changed, 20 insertions(+), 50 deletions(-)
New commits:
commit 53dd3a2a3721ecb8c447f89bd5315b080d7683c8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 28 21:41:23 2012 -0500
we don't use this anymore, don't bother with directories under rhq.ear in this
class
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java
index e9695fb..3b0a689 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java
@@ -62,21 +62,11 @@ public class DownloadsUIBean implements Serializable {
}
private File getConnectorDownloadsDir() throws Exception {
- File serverHomeDir = LookupUtil.getCoreServer().getJBossServerHomeDir();
- File downloadDir = new File(serverHomeDir,
"deploy/rhq.ear/rhq-downloads/connectors");
- if (!downloadDir.exists()) {
- throw new FileNotFoundException("Missing connectors download directory
at [" + downloadDir + "]");
- }
- return downloadDir;
+ throw new FileNotFoundException("Missing connectors download
directory");
}
private File getClientDownloadDir() throws Exception {
- File serverHomeDir = LookupUtil.getCoreServer().getJBossServerHomeDir();
- File downloadDir = new File(serverHomeDir,
"deploy/rhq.ear/rhq-downloads/rhq-client");
- if (!downloadDir.exists()) {
- throw new FileNotFoundException("Missing remote client download
directory at [" + downloadDir + "]");
- }
- return downloadDir;
+ throw new FileNotFoundException("Missing remote client download
directory");
}
public Properties getClientVersionProperties() throws Exception {
@@ -103,12 +93,7 @@ public class DownloadsUIBean implements Serializable {
}
private File getBundleDeployerDownloadDir() throws Exception {
- File serverHomeDir = LookupUtil.getCoreServer().getJBossServerHomeDir();
- File downloadDir = new File(serverHomeDir,
"deploy/rhq.ear/rhq-downloads/bundle-deployer");
- if (!downloadDir.exists()) {
- throw new FileNotFoundException("Missing bundle deployer download
directory at [" + downloadDir + "]");
- }
- return downloadDir;
+ throw new FileNotFoundException("Missing bundle deployer download
directory");
}
private static List<File> getFiles(File downloadDir) {
commit eef8e20dca5ef7a85c08e4764f376575b39c3a09
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 28 21:41:04 2012 -0500
get server client-api module to get the scripts from new correct place
diff --git a/.classpath b/.classpath
index e4ac1a7..e974d52 100644
--- a/.classpath
+++ b/.classpath
@@ -59,6 +59,7 @@
<classpathentry kind="src"
path="modules/enterprise/server/installer/src/test/java"/>
<classpathentry kind="src"
path="modules/enterprise/gui/content_http-war/src/main/java"/>
<classpathentry kind="src"
path="modules/enterprise/server/client-api/src/main/java"/>
+ <classpathentry kind="src"
path="modules/enterprise/server/client-api/src/test/java"/>
<classpathentry kind="src"
path="modules/enterprise/remoting/client-api/src/main/java"/>
<classpathentry kind="src"
path="modules/enterprise/remoting/cli/src/main/java"/>
<classpathentry kind="src"
path="modules/enterprise/remoting/cli/src/test/java"/>
diff --git
a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
index 61ababb..1cbbe39 100644
---
a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
+++
b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
@@ -31,10 +31,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.rhq.bindings.script.BaseRhqSchemeScriptSourceProvider;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.common.ServerDetails;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.system.SystemManagerLocal;
+import org.rhq.enterprise.server.core.CoreServerMBean;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -46,30 +43,22 @@ public class RhqDownloadsScriptSourceProvider extends
BaseRhqSchemeScriptSourceP
private static final String AUTHORITY = "downloads";
- private SystemManagerLocal systemManager;
- private SubjectManagerLocal subjectManager;
+ private CoreServerMBean coreServer;
public RhqDownloadsScriptSourceProvider() {
- this(LookupUtil.getSystemManager(), LookupUtil.getSubjectManager());
+ this(LookupUtil.getCoreServer());
}
- public RhqDownloadsScriptSourceProvider(SystemManagerLocal systemManager,
SubjectManagerLocal subjectManager) {
+ public RhqDownloadsScriptSourceProvider(CoreServerMBean coreServerMBean) {
super(AUTHORITY);
- this.systemManager = systemManager;
- this.subjectManager = subjectManager;
+ this.coreServer = coreServerMBean;
}
@Override
protected Reader doGetScriptSource(URI scriptUri) {
String path = scriptUri.getPath().substring(1); //remove the leading /
- Subject overlord = subjectManager.getOverlord();
-
- ServerDetails serverDetails = systemManager.getServerDetails(overlord);
-
- String installHomeDir =
serverDetails.getDetails().get(ServerDetails.Detail.SERVER_INSTALL_DIR);
- File downloadsDir = new File(installHomeDir,
-
"modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads");
+ File downloadsDir = getDownloadHomeDir();
File scriptDownloads = new File(downloadsDir, "script-modules");
File file = new File(scriptDownloads, path);
@@ -81,4 +70,9 @@ public class RhqDownloadsScriptSourceProvider extends
BaseRhqSchemeScriptSourceP
}
}
+ private File getDownloadHomeDir() {
+ File earDeployDir = this.coreServer.getEarDeploymentDir();
+ File downloadDir = new File(earDeployDir, "rhq-downloads");
+ return downloadDir;
+ }
}
diff --git
a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
index a2c4a33..e62dd32 100644
---
a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
+++
b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
@@ -25,20 +25,16 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.Reader;
import java.net.URI;
-import java.util.HashMap;
import org.mockito.Mockito;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.common.ServerDetails;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.client.RhqDownloadsScriptSourceProvider;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.system.SystemManagerLocal;
+import org.rhq.enterprise.server.core.CoreServerMBean;
/**
*
@@ -54,7 +50,7 @@ public class RhqDownloadsScriptSourceProviderTest {
@BeforeClass
public void createTmpDir() throws Exception {
tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
- File downloadsDir = new File(new File(new File(new File(tmpDir,
"deploy"), "rhq.ear"), "rhq-downloads"),
"script-modules");
+ File downloadsDir = new File(tmpDir, "rhq-downloads/script-modules");
downloadsDir.mkdirs();
File testScript = new File(downloadsDir, "test-script.js");
@@ -76,17 +72,11 @@ public class RhqDownloadsScriptSourceProviderTest {
}
public void canLocateScripts() throws Exception {
- SystemManagerLocal systemManager = Mockito.mock(SystemManagerLocal.class);
- SubjectManagerLocal subjectManager = Mockito.mock(SubjectManagerLocal.class);
+ CoreServerMBean coreServer = Mockito.mock(CoreServerMBean.class);
- ServerDetails details = new ServerDetails();
- HashMap<ServerDetails.Detail, String> map = new
HashMap<ServerDetails.Detail, String>();
- map.put(ServerDetails.Detail.SERVER_HOME_DIR, tmpDir.getAbsolutePath());
- details.setDetails(map);
-
-
Mockito.when(systemManager.getServerDetails(Mockito.<Subject>any())).thenReturn(details);
+ Mockito.when(coreServer.getEarDeploymentDir()).thenReturn(tmpDir);
- RhqDownloadsScriptSourceProvider provider = new
RhqDownloadsScriptSourceProvider(systemManager, subjectManager);
+ RhqDownloadsScriptSourceProvider provider = new
RhqDownloadsScriptSourceProvider(coreServer);
URI location = new URI("rhq://downloads/test-script.js");
Show replies by date