modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
| 5 +-
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
| 6 +--
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
| 3 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
| 3 -
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
| 3 -
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
| 17 +++++-----
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
| 2 -
7 files changed, 22 insertions(+), 17 deletions(-)
New commits:
commit 5e187ddde1d437afc8d0e7e706ed0ea451225587
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Mar 30 11:07:13 2012 -0400
[BZ 759615] put our dynamic class definition in a separate package to avoid conflict
with signed packages
diff --git
a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
index 2c1258d..74c0019 100644
---
a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
+++
b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
@@ -144,9 +144,10 @@ public class ResourceClientFactory {
private Class<?> defineCustomInterface(ResourceClientProxy proxy) {
try {
- // define the dynamic class
+ // define the dynamic class - do not put it in any known rhq package in case
our jars are signed (see BZ-794503)
ClassPool pool = ClassPool.getDefault();
- CtClass customClass = pool.makeInterface(ResourceClientProxy.class.getName()
+ proxy.fingerprint);
+ CtClass customClass =
pool.makeInterface("org.rhq.bindings.client.dynamic."
+ + ResourceClientProxy.class.getSimpleName() + proxy.fingerprint);
for (String key : proxy.allProperties.keySet()) {
Object prop = proxy.allProperties.get(key);
commit ae9c8d0116e63386df6cce506de33adbedfa3020
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Mar 30 12:36:11 2012 +0200
config file arguments (option -c to start scripts) must be relative.
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 8557a5d..2eec0d5 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -76,7 +76,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
// Only barf a stack trace for runtime exceptions.
log.error("Discovery of a " +
discoveryContext.getResourceType().getName()
+ " Resource failed for " +
processScanResult.getProcessInfo() + ".", e);
- } catch (Exception e) {
+ } catch (Exception e) {
log.error("Discovery of a " +
discoveryContext.getResourceType().getName()
+ " Resource failed for " +
processScanResult.getProcessInfo() + " - cause: " + e);
}
@@ -85,7 +85,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
return discoveredResources;
}
- protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext
discoveryContext,
+ protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext
discoveryContext,
ProcessScanResult psr)
throws Exception {
Configuration pluginConfig = discoveryContext.getDefaultPluginConfiguration();
// IF SE, then look at domain/configuration/host.xml <management
interface="default" port="9990
@@ -172,7 +172,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
String cwd = process.getExecutable().getCwd();
baseDir = new File(cwd, baseDirString);
if (!baseDir.exists()) {
- baseDir = new File(homeDir, baseDirString);
+ baseDir = new File(homeDir, baseDirString);
}
}
}
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 6fbfcef..20e5518 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -281,14 +281,17 @@ public class BaseServerComponent<T extends
ResourceComponent<?>> extends BaseCom
String configFile;
BaseProcessDiscovery processDiscovery;
+ String configDir = pluginConfig.getSimpleValue("configDir",null);
switch (mode) {
case STANDALONE:
processDiscovery = new StandaloneASDiscovery();
configFile = pluginConfig.getSimpleValue("config", null);
+ configFile = configDir + File.separator + configFile;
break;
case HOST:
processDiscovery = new HostControllerDiscovery();
configFile = pluginConfig.getSimpleValue("hostConfig", null);
+ configFile = configDir + File.separator + configFile;
break;
default:
throw new IllegalArgumentException("Unsupported mode: " +
mode);
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
index 225468f..a7e684d 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
@@ -101,8 +101,7 @@ public class HostControllerDiscovery extends BaseProcessDiscovery {
Configuration pluginConfig = details.getPluginConfiguration();
String domainConfig =
getServerConfigFromCommandLine(psr.getProcessInfo().getCommandLine(), getMode());
pluginConfig.put(new PropertySimple("domainConfig", domainConfig));
- String configDirString = pluginConfig.getSimpleValue("configDir",
null);
- pluginConfig.put(new PropertySimple("hostConfig",
getHostXmlFile(process, new File(configDirString))));
+ pluginConfig.put(new PropertySimple("hostConfig",
getHostXmlFileName(process)));
return details;
}
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
index 4a80c60..2075385 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
@@ -111,8 +111,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery {
DiscoveredResourceDetails details = super.buildResourceDetails(discoveryContext,
psr);
ProcessInfo process = psr.getProcessInfo();
Configuration pluginConfig = details.getPluginConfiguration();
- String configDirString = pluginConfig.getSimpleValue("configDir",
null);
- pluginConfig.put(new PropertySimple("config", getHostXmlFile(process,
new File(configDirString))));
+ pluginConfig.put(new PropertySimple("config",
getHostXmlFileName(process)));
return details;
}
commit 638c1dba23ad218e56fb8b1456b07c82e608574f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Mar 30 09:41:28 2012 +0200
Try to better see why this is failing.
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
index f34f674..0dd5d0c 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
@@ -78,6 +78,10 @@ public class DomainSocketBindingTest extends AbstractJBossAS7PluginTest
{
public void addBinding() throws Exception {
Configuration configuration = loadConfig();
+ PropertyList pl = (PropertyList) configuration.get("*");
+ int count = pl.getList().size();
+
+ // Now add a binding
PropertyMap map = new PropertyMap("binding");
PropertySimple ps = new PropertySimple("name","bla");
map.put(ps);
@@ -87,18 +91,17 @@ public class DomainSocketBindingTest extends
AbstractJBossAS7PluginTest {
map.put(ps);
ps = new
PropertySimple("multicast-port:expr","${foo.bar.baz:12346}");
map.put(ps);
- PropertyList pl = (PropertyList) configuration.get("*");
- int count = pl.getList().size();
pl.add(map);
ConfigurationUpdateRequest request = new
ConfigurationUpdateRequest(1,configuration,getResource().getId());
ConfigurationUpdateResponse response =
pluginContainer.getConfigurationManager().executeUpdateResourceConfigurationImmediately(request);
assert response!=null;
+ assert response.getConfigurationUpdateId() == 1 : "Expected update id 1, but
got " + response.getConfigurationUpdateId();
assert response.getErrorMessage()==null: "Config add resulted in this error:
" + response.getErrorMessage();
configuration = loadConfig();
pl = (PropertyList) configuration.get("*");
- assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ count+1;
+ assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ (count+1);
}
@Test(priority = 11)
@@ -117,7 +120,7 @@ public class DomainSocketBindingTest extends
AbstractJBossAS7PluginTest {
PropertyList pl = (PropertyList) configuration.get("*");
pl.add(map);
- ConfigurationUpdateRequest request = new
ConfigurationUpdateRequest(1,configuration,getResource().getId());
+ ConfigurationUpdateRequest request = new
ConfigurationUpdateRequest(2,configuration,getResource().getId());
ConfigurationUpdateResponse response =
pluginContainer.getConfigurationManager().executeUpdateResourceConfigurationImmediately(request);
assert response!=null;
assert response.getErrorMessage()==null: "Config add resulted in this error:
" + response.getErrorMessage();
@@ -136,7 +139,7 @@ public class DomainSocketBindingTest extends
AbstractJBossAS7PluginTest {
assert map != null : "Did not find 'bla2' in the returned
config";
map.put(new PropertySimple("port:expr",22355));
map.put(new PropertySimple("fixed-port",true));
- request = new ConfigurationUpdateRequest(2,configuration,getResource().getId());
+ request = new ConfigurationUpdateRequest(3,configuration,getResource().getId());
response =
pluginContainer.getConfigurationManager().executeUpdateResourceConfigurationImmediately(request);
assert response!=null;
assert response.getErrorMessage()==null: "Config update resulted in this
error: " + response.getErrorMessage();
@@ -160,7 +163,7 @@ public class DomainSocketBindingTest extends
AbstractJBossAS7PluginTest {
int count = pl.getList().size();
pl.add(map);
- ConfigurationUpdateRequest request = new
ConfigurationUpdateRequest(1,configuration,getResource().getId());
+ ConfigurationUpdateRequest request = new
ConfigurationUpdateRequest(4,configuration,getResource().getId());
ConfigurationUpdateResponse response =
pluginContainer.getConfigurationManager().executeUpdateResourceConfigurationImmediately(request);
assert response!=null;
assert response.getErrorMessage()==null: "Config add resulted in this error:
" + response.getErrorMessage();
@@ -180,7 +183,7 @@ public class DomainSocketBindingTest extends
AbstractJBossAS7PluginTest {
}
assert pl.getList().size() == count;
- request = new ConfigurationUpdateRequest(3,configuration,getResource().getId());
+ request = new ConfigurationUpdateRequest(5,configuration,getResource().getId());
response =
pluginContainer.getConfigurationManager().executeUpdateResourceConfigurationImmediately(request);
assert response!=null;
assert response.getErrorMessage()==null: "Property removal resulted in this
error: " + response.getErrorMessage();
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
index df9eb7a..99f8347 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
@@ -95,7 +95,7 @@ public class SocketBindingTest extends AbstractJBossAS7PluginTest {
configuration = loadConfig();
pl = (PropertyList) configuration.get("*");
- assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ count+1;
+ assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ (count+1);
}
@Test(priority = 11)