[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 943cc7818a3934dc3516ea39ddf632d437e9d0a5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 17:26:15 2012 -0500
trivial - remove a debugging sleep stmt
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index 2df0d96..36b0821 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -88,9 +88,6 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- System.out.println("***** SLEEP");
- Thread.sleep(60000);
-
pluginScanner.startDeployment();
}
11 years
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java | 7 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 57 +++++-----
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java | 6 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 38 +++++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 44 ++-----
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 7 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml | 1
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml | 1
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml | 1
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml | 1
17 files changed, 119 insertions(+), 82 deletions(-)
New commits:
commit 01044f44df613b54d5d5fb36c4b4c713bf1fcd1b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Nov 30 17:22:34 2012 -0500
More work on the metadata tests.
- better protect against test interaction issues by using explicit "AfterClass"
stand-in tests for each subclass.
- work on PluginManagerBeanTest such that it registers plugins to be enabled
before trying to disable them.
- Not passing, maybe a real problem?
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
index 29c146f..26e1cab 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBeanTest.java
@@ -41,6 +41,12 @@ public class AlertMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("Alert templates should have been deleted.", 0, templates.size());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Alerts.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
void createAlertTemplate(String name, String resourceTypeName, String pluginName) throws Exception {
SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
index 6f5582a..c109bf8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java
@@ -108,6 +108,12 @@ public class ContentMetadataManagerBeanTest extends MetadataBeanTest {
bundleType.getName());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Content.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
PackageType loadPackageType(String resourceType, String plugin, String packageType) {
return (PackageType) getEntityManager()
.createQuery(
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
index 99e1e22..8a11e07 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java
@@ -60,6 +60,12 @@ public class EventMetadataManagerBeanTest extends MetadataBeanTest {
assertEquals("The description property should have been updated", "EVENT ONE", eventDef.getDescription());
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Events.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
EventDefinition loadEventDef(String name, String resourceType) {
return (EventDefinition) getEntityManager()
.createQuery("from EventDefinition e where e.name = :name and e.resourceType.name = :resourceType")
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
index 2bf2f31..25fbd5c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
@@ -16,13 +16,6 @@ import org.rhq.test.AssertUtils;
public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
- @Override
- protected void beforeMethod() throws Exception {
- super.beforeMethod();
-
- disableAfterClassStandIn = true;
- }
-
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" })
void registerMetricsPlugin() throws Exception {
createPlugin("metric-test-plugin", "1.0", "plugin_v1.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index cfaf7a8..dbdb765 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -28,7 +28,6 @@ import org.dbunit.dataset.datatype.IDataTypeFactory;
import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.FlatXmlProducer;
import org.dbunit.operation.DatabaseOperation;
-import org.testng.annotations.Test;
import org.xml.sax.InputSource;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -40,6 +39,7 @@ import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService;
+import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
@@ -48,28 +48,21 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class MetadataBeanTest extends AbstractEJB3Test {
+ protected PluginDeploymentScanner pluginScanner;
+
private List<Integer> pluginIds = new ArrayList<Integer>();
- protected boolean disableAfterClassStandIn = false;
- // Arquillian (1.0.2) executes @AfterClass after each test. So, instead turn it into a low priority
- // test that should execute last.
- /**
- * !! Important !! This should be disabled if the subclass has tests in groups other than plugin.metadata because<br/>
- * !! priority applies only to the tests in the same grouping.<br/>
- * <br/>
+ /**
+ * <pre>IMPORTANT NOTE FOR SUBCLASS IMPLEMENTORS
+ * Arquillian (1.0.2) executes @AfterXXX after each test. The work below would normally be done in
+ * an AfterClass method, but instead we'll use mock tests, that perform last for each subclass, to
+ * perform this cleanup code.
+ * </pre>
* Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests look
* at what plugins are in the database, and then look for corresponding plugin files on the file system. MetadataTest
* however removes the generated plugin files during each test run.
+ *
*/
- @Test(priority = 10, alwaysRun = true, groups = { "plugin.metadata" })
- void afterClassStandIn() throws Exception {
- if (!disableAfterClassStandIn) {
- afterClassWork();
- } else {
- System.out.println("Skipping MetadataBeanTest.afterClassStandIn, it is disabled by a subclass.");
- }
- }
-
protected void afterClassWork() throws Exception {
PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
@@ -81,9 +74,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
@Override
protected void beforeMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
setupDB();
@@ -100,9 +90,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
*/
@Override
protected void afterMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
unprepareServerPluginService();
unprepareScheduler();
@@ -158,8 +145,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
protected void createPlugin(String pluginFileName, String version, String descriptorFileName) throws Exception {
URL descriptorURL = getDescriptorURL(descriptorFileName);
PluginDescriptor pluginDescriptor = loadPluginDescriptor(descriptorURL);
- String pluginFilePath = getCurrentWorkingDir() + "/" + pluginFileName + ".jar";
- File pluginFile = new File(pluginFilePath);
+ String pluginFilePath = getPluginWorkDir() + "/" + pluginFileName + ".jar";
Plugin plugin = new Plugin(pluginDescriptor.getName(), pluginFilePath);
plugin.setDisplayName(pluginDescriptor.getName());
@@ -169,7 +155,6 @@ public class MetadataBeanTest extends AbstractEJB3Test {
plugin.setVersion(pluginDescriptor.getVersion());
plugin.setMD5(MessageDigestGenerator.getDigestString(descriptorURL));
- SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
PluginManagerLocal pluginMgr = LookupUtil.getPluginManager();
pluginMgr.registerPlugin(plugin, pluginDescriptor, null, true);
@@ -177,13 +162,31 @@ public class MetadataBeanTest extends AbstractEJB3Test {
pluginIds.add(plugin.getId());
}
+ protected void preparePluginScannerService() {
+ if (this.pluginScanner == null) {
+ this.pluginScanner = new PluginDeploymentScanner();
+
+ String pluginDirPath = null;
+ try {
+ pluginDirPath = getPluginWorkDir();
+ } catch (Exception e) {
+ throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
+ }
+ this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
+ this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
+ this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
+ }
+
+ preparePluginScannerService(this.pluginScanner);
+ }
+
private URL getDescriptorURL(String descriptor) {
String dir = getClass().getSimpleName();
return getClass().getResource(dir + "/" + descriptor);
}
protected String getPluginWorkDir() throws Exception {
- return getCurrentWorkingDir() + "/rhqtest";
+ return getCurrentWorkingDir() + "/" + this.getClass().getSimpleName() + "/" + "plugins";
}
protected String getCurrentWorkingDir() throws Exception {
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
index b395120..b34fa4c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
@@ -56,6 +56,12 @@ public class MultiplePluginExtensionMetadataTest extends MetadataBeanTest {
checkChild2Plugin(); // check that the changes to the parent type propogated to the child #2
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createPlugin("parent-plugin.jar", "1.0", "parent_plugin_v1.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
index e381168..337efd2 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java
@@ -50,6 +50,12 @@ public class MultiplePluginExtensionSinglePluginDescriptorMetadataTest extends M
checkChildPlugin(); // check that the changes to the parent type propogated to the child #1 and #2
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createPlugin("parent-plugin.jar", "1.0", "parent_plugin_v1.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
index 59f5d44..f863fb1 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/OperationMetadataManagerBeanTest.java
@@ -111,6 +111,12 @@ public class OperationMetadataManagerBeanTest extends MetadataBeanTest {
assertNull("Results definition should have been removed", resultsDef);
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "Operations.UpgradePlugin" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
ResourceType loadResourceTypeWithOperationDefs(String resourceType, String plugin) {
return (ResourceType) getEntityManager().createQuery(
"from ResourceType t left join fetch t.operationDefinitions tod "
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
index fedd45e..af24f3c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
@@ -123,6 +123,12 @@ public class PluginExtensionMetadataTest extends MetadataBeanTest {
checkChildPlugin(); // check that the changes to the parent type propogated to the child
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createPlugin("parent-plugin.jar", "1.0", "parent_plugin_v1.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index ff279d9..2df0d96 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.resource.metadata;
import static java.util.Arrays.asList;
+import java.io.File;
import java.util.List;
import javax.ejb.EJBException;
@@ -30,6 +31,7 @@ import org.testng.annotations.Test;
import org.rhq.core.domain.plugin.Plugin;
import org.rhq.core.domain.plugin.PluginStatusType;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.util.file.FileUtil;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.inventory.InventoryManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
@@ -53,7 +55,14 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
subjectMgr = LookupUtil.getSubjectManager();
pluginMgr = LookupUtil.getPluginManager();
- disableAfterClassStandIn = true;
+ FileUtil.purge(new File(getPluginWorkDir()), true);
+
+ preparePluginScannerService();
+ }
+
+ @Override
+ protected void afterMethod() throws Exception {
+ unpreparePluginScannerService();
}
public void registerPlugins() throws Exception {
@@ -71,16 +80,24 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
new PurgeResourceTypesJob().execute(null);
new PurgePluginsJob().execute(null);
}
+
+ //createPluginJarFile("child1-plugin.jar", "child1_plugin_v1.xml"));
+
+ createPluginJarFile("test-plugin1.jar", "plugin_1.xml");
+ createPluginJarFile("test-plugin2.jar", "plugin_2.xml");
+ createPluginJarFile("test-plugin3.jar", "plugin_3.xml");
+ createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
+
+ System.out.println("***** SLEEP");
+ Thread.sleep(60000);
- createPlugin("test-plugin1", "1.0", "plugin_1.xml");
- createPlugin("test-plugin2", "1.0", "plugin_2.xml");
- createPlugin("test-plugin3", "1.0", "plugin_3.xml");
- createPlugin("test-plugin3.1", "1.0", "plugin_3.1.xml");
+ pluginScanner.startDeployment();
}
@Test(dependsOnMethods = { "registerPlugins" })
public void disablePlugin() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin3");
+ assertTrue("Plugin should not already be disabled", plugin.isEnabled());
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin.getId()));
plugin = pluginMgr.getPlugin("PluginManagerBeanTestPlugin3");
@@ -92,18 +109,23 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "registerPlugins" })
public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception {
Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
- EJBException exception = null;
+ assertTrue("Plugin should not already be disabled", plugin.isEnabled());
+
+ Exception exception = null;
try {
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin.getId()));
- } catch (EJBException e) {
+ } catch (Exception e) {
exception = e;
}
+ plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ assertTrue("Plugin should not have been disabled", plugin.isEnabled());
+
assertNotNull("Expected exception to be thrown when trying to disable a plugin that has dependent plugins",
exception);
assertTrue("Expected an IllegalArgumentException when trying to disable a plugin with dependent plugins",
- exception.getCausedByException() instanceof IllegalArgumentException);
+ exception.getCause() instanceof IllegalArgumentException);
}
@Test(dependsOnMethods = { "doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled" })
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
index 4e19f85..5417305 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java
@@ -4,15 +4,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -54,13 +51,10 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
private ResourceTypeManagerLocal resourceTypeMgr;
private List<File> createdJarFiles = new ArrayList<File>();
- private PluginDeploymentScanner pluginScanner;
- @BeforeMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- protected void beforeTestMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
+ @Override
+ protected void beforeMethod() throws Exception {
+ super.beforeMethod();
preparePluginScannerService();
@@ -76,11 +70,8 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
createdJarFiles.clear();
}
- @AfterMethod(groups = { "plugin.metadata" }, dependsOnGroups = { "integration.ejb3" })
- protected void afterTestMethod() throws Exception {
- if (!inContainer()) {
- return;
- }
+ @Override
+ protected void afterMethod() throws Exception {
// clean up any generated jar files - we want to remove these so they don't get in the way of a future test run
if (!createdJarFiles.isEmpty()) {
for (File doomed : createdJarFiles) {
@@ -90,25 +81,8 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
createdJarFiles.clear();
unpreparePluginScannerService();
- }
- // this method isn't a test method
- private void preparePluginScannerService() {
- if (this.pluginScanner == null) {
- this.pluginScanner = new PluginDeploymentScanner();
-
- String pluginDirPath = null;
- try {
- pluginDirPath = getPluginWorkDir();
- } catch (Exception e) {
- throw new RuntimeException("Cannot determine where to put the plugin jar files", e);
- }
- this.pluginScanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these
- this.pluginScanner.setServerPluginDir(null); // we don't want to scan for these
- this.pluginScanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
- }
-
- preparePluginScannerService(this.pluginScanner);
+ super.afterMethod();
}
public void testRegisterPlugins() throws Exception {
@@ -127,6 +101,12 @@ public class PluginScanningExtensionMetadataTest extends MetadataBeanTest {
}
}
+ // this needs to be the last test executed in the class, it does cleanup
+ @Test(priority = 10, alwaysRun = true, dependsOnMethods = { "testRegisterPlugins" })
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
private void registerParentPluginV1() throws Exception {
// register the plugin, load the new type and test to make sure its what we expect
createdJarFiles.add(createPluginJarFile("parent-plugin.jar", "parent_plugin_v1.xml"));
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 5f2acd8..a5e23ff 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -53,13 +53,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Test(groups = { "plugin.metadata" })
public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
- @Override
- protected void beforeMethod() throws Exception {
- super.beforeMethod();
-
- disableAfterClassStandIn = true;
- }
-
@Test(groups = { "plugin.resource.metadata.test", "NewPlugin" })
public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception {
// create the initial type that has bundle and drift definitions
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 6fc8350..975efb8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian {
testEar.addAsLibraries(dependencies);
// Print out the test EAR structure
- // System.out.println("** The Deployment EAR: " + ear.toString(true) + "\n");
+ //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n");
// Save the test EAR to a zip file for inspection (set file explicitly)
//exportZip(testEar, new File("/home/jshaughn/temp/test-ear.ear"));
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
index 6680aa6..a639a3b 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin1"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
index c6f8736..e2c7b22 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin2"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
index e885167..ec2aef1 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin3.1"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
index 78184bf..c2bde29 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
@@ -1,4 +1,5 @@
<plugin name="PluginManagerBeanTestPlugin3"
+ version="1.0"
package="org.rhq.plugins.test"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
11 years
[rhq] modules/core
by mazz
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 25 ++++++----
2 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 59514c1a6a6a879d6a7bf0174c0d3ca252ebbfed
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 17:11:20 2012 -0500
[BZ 882280] purge old perspective plugin from the DB during db upgrade
(cherry picked from commit dadcd3fbff9d883c7d6a166ad42687c26c9b5a70)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 615b252..036b65b 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.127</db.schema.version>
+ <db.schema.version>2.128</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 7188198..19ac9dd 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -30,8 +30,8 @@
<!-- Empty initial schema to avoid install failure on default latest schema version -->
</schemaSpec>
- <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
-
+ <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
+
<schemaSpec version="2.70">
<schema-addColumn table="RHQ_ALERT" column="ACK_TIME" columnType="LONG" />
<schema-addColumn table="RHQ_ALERT" column="ACK_SUBJECT" precision="100" columnType="VARCHAR2" />
@@ -1267,10 +1267,10 @@
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = false
</statement>
- <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
+ <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = 0
- </statement>
+ </statement>
</schema-directSQL>
<schema-alterColumn table="RHQ_RESOURCE_TYPE" column="DELETED" nullable="FALSE" />
</schemaSpec>
@@ -1351,14 +1351,14 @@
<schemaSpec version="2.105">
<schema-addColumn table="RHQ_REPO" column="OWNER_ID" columnType="INTEGER" />
<schema-addColumn table="RHQ_REPO" column="IS_PRIVATE" columnType="BOOLEAN" />
- <schema-directSQL>
+ <schema-directSQL>
<statement targetDBVendor="postgresql" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = false
</statement>
<statement targetDBVendor="oracle" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = 0
</statement>
- </schema-directSQL>
+ </schema-directSQL>
<schema-alterColumn table="RHQ_REPO" column="IS_PRIVATE" nullable="FALSE"/>
<schema-directSQL>
<statement desc="Creating OWNER_ID foreign key relation on RHQ_REPO">
@@ -1970,7 +1970,7 @@
</schema-directSQL>
</schemaSpec>
- <!-- Remove unnecessary tables for RHQ on AS7 -->
+ <!-- Remove unnecessary tables for RHQ on AS7 -->
<schemaSpec version="2.127">
<schema-dropTable table="JMS_MESSAGES" ignoreError="true" />
<schema-dropTable table="JMS_TRANSACTIONS" ignoreError="true" />
@@ -1978,7 +1978,16 @@
<schema-dropTable table="JMS_ROLES" ignoreError="true" />
<schema-dropTable table="JMS_SUBSCRIPTIONS" ignoreError="true" />
</schemaSpec>
-
+
+ <!-- The perspective server plugin type has been removed - delete perspective plugin from DB -->
+ <schemaSpec version="2.128">
+ <schema-directSQL>
+ <statement>
+ DELETE FROM RHQ_PLUGIN WHERE NAME = 'CorePerspective'
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
11 years
[rhq] Branch 'rhq-on-as7' - modules/core
by mazz
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 25 ++++++----
2 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit dadcd3fbff9d883c7d6a166ad42687c26c9b5a70
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 17:11:20 2012 -0500
[BZ 882280] purge old perspective plugin from the DB during db upgrade
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index d47e864..c110636 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.127</db.schema.version>
+ <db.schema.version>2.128</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 7188198..19ac9dd 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -30,8 +30,8 @@
<!-- Empty initial schema to avoid install failure on default latest schema version -->
</schemaSpec>
- <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
-
+ <!-- 2.1 through 2.69 removed, no longer needed as these versions are not in use -->
+
<schemaSpec version="2.70">
<schema-addColumn table="RHQ_ALERT" column="ACK_TIME" columnType="LONG" />
<schema-addColumn table="RHQ_ALERT" column="ACK_SUBJECT" precision="100" columnType="VARCHAR2" />
@@ -1267,10 +1267,10 @@
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = false
</statement>
- <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
+ <statement targetDBVendor="oracle" desc="Set deleted flag for existing resources types to false">
UPDATE RHQ_RESOURCE_TYPE
SET DELETED = 0
- </statement>
+ </statement>
</schema-directSQL>
<schema-alterColumn table="RHQ_RESOURCE_TYPE" column="DELETED" nullable="FALSE" />
</schemaSpec>
@@ -1351,14 +1351,14 @@
<schemaSpec version="2.105">
<schema-addColumn table="RHQ_REPO" column="OWNER_ID" columnType="INTEGER" />
<schema-addColumn table="RHQ_REPO" column="IS_PRIVATE" columnType="BOOLEAN" />
- <schema-directSQL>
+ <schema-directSQL>
<statement targetDBVendor="postgresql" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = false
</statement>
<statement targetDBVendor="oracle" desc="Set is_private flag for existing repos to false">
UPDATE RHQ_REPO SET IS_PRIVATE = 0
</statement>
- </schema-directSQL>
+ </schema-directSQL>
<schema-alterColumn table="RHQ_REPO" column="IS_PRIVATE" nullable="FALSE"/>
<schema-directSQL>
<statement desc="Creating OWNER_ID foreign key relation on RHQ_REPO">
@@ -1970,7 +1970,7 @@
</schema-directSQL>
</schemaSpec>
- <!-- Remove unnecessary tables for RHQ on AS7 -->
+ <!-- Remove unnecessary tables for RHQ on AS7 -->
<schemaSpec version="2.127">
<schema-dropTable table="JMS_MESSAGES" ignoreError="true" />
<schema-dropTable table="JMS_TRANSACTIONS" ignoreError="true" />
@@ -1978,7 +1978,16 @@
<schema-dropTable table="JMS_ROLES" ignoreError="true" />
<schema-dropTable table="JMS_SUBSCRIPTIONS" ignoreError="true" />
</schemaSpec>
-
+
+ <!-- The perspective server plugin type has been removed - delete perspective plugin from DB -->
+ <schemaSpec version="2.128">
+ <schema-directSQL>
+ <statement>
+ DELETE FROM RHQ_PLUGIN WHERE NAME = 'CorePerspective'
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
11 years
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat | 161 ++++++++++
1 file changed, 161 insertions(+)
New commits:
commit b1fcd4e34d014b7fef9b469436e92566e4512053
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 17:00:57 2012 -0500
windows installer script for the new installer
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat
new file mode 100644
index 0000000..81d83ad
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat
@@ -0,0 +1,161 @@
+@echo off
+
+rem ===========================================================================
+rem RHQ Server Windows Install Script
+rem
+rem This file is used to complete the installation of the RHQ Server on a
+rem Windows platform.
+rem
+rem This script is customizable by setting the following environment variables:
+rem
+rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug
+rem messages.
+rem If not set or set to "false", debug is turned off.
+rem
+rem RHQ_SERVER_HOME - Defines where the Server's home install directory is.
+rem If not defined, it will be assumed to be the parent
+rem directory of the directory where this script lives.
+rem
+rem
+rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will
+rem use. This will be ignored if
+rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
+rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
+rem not set, the Server's embedded JRE will be used.
+rem
+rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
+rem executable to use. If this is set,
+rem RHQ_SERVER_JAVA_HOME is ignored.
+rem If this is not set, then
+rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe
+rem is used. If this and
+rem RHQ_SERVER_JAVA_HOME are not set, the
+rem Server's embedded JRE will be used.
+rem
+rem RHQ_SERVER_INSTALLER_JAVA_OPTS - Java VM command line options to be
+rem passed into the Java VM. If this is not defined
+rem this script will pass in a default set of options.
+rem If you only want to add options to the defaults,
+rem then you will want to use
+rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS instead.
+rem
+rem RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS - additional Java VM command
+rem line options to be passed into the VM.
+rem This is added to
+rem RHQ_SERVER_INSTALLER_JAVA_OPTS; it
+rem is mainly used to augment the
+rem default set of options. This can be
+rem left unset if it is not needed.
+rem
+rem If the embedded JRE is to be used but is not available, the fallback
+rem JRE to be used will be determined by the JAVA_HOME environment variable.
+rem ===========================================================================
+
+setlocal
+
+rem if debug variable is set, it is assumed to be on, unless its value is false
+if "%RHQ_SERVER_DEBUG%" == "false" (
+ set RHQ_SERVER_DEBUG=
+)
+
+rem ----------------------------------------------------------------------
+rem Change directory so the current directory is the Server home.
+rem ----------------------------------------------------------------------
+
+set RHQ_SERVER_BIN_DIR_PATH=%~dp0
+
+if not defined RHQ_SERVER_HOME (
+ cd "%RHQ_SERVER_BIN_DIR_PATH%\.."
+) else (
+ cd "%RHQ_SERVER_HOME%" || (
+ echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME%
+ exit /B 1
+ )
+)
+
+set RHQ_SERVER_HOME=%CD%
+
+if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME%
+
+rem ----------------------------------------------------------------------
+rem Find the Java executable and verify we have a VM available.
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
+ if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre
+)
+
+if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe
+
+if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME%
+if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH%
+
+if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" (
+ echo There is no JVM available.
+ echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately.
+ exit /B 1
+)
+
+if not exist "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" (
+ echo ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ instance
+ echo Missing %RHQ_SERVER_HOME%\jboss-modules.jar
+ exit /B 1
+)
+
+rem ----------------------------------------------------------------------
+rem Determine the logs directory
+rem ----------------------------------------------------------------------
+
+set _LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs
+
+rem ----------------------------------------------------------------------
+rem Prepare the VM command line options to be passed in
+rem ----------------------------------------------------------------------
+
+if not defined RHQ_SERVER_INSTALLER_JAVA_OPTS set RHQ_SERVER_INSTALLER_JAVA_OPTS=-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true
+
+rem Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS.
+if defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=DEBUG
+if not defined RHQ_SERVER_DEBUG set _RHQ_LOGLEVEL=INFO
+set RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Djava.awt.headless=true -Drhq.server.properties-file=%RHQ_SERVER_HOME%\bin\rhq-server.properties -Drhq.server.installer.logdir=%RHQ_SERVER_HOME%\logs -Drhq.server.installer.loglevel=%_RHQ_LOGLEVEL%
+
+rem Sample JPDA settings for remote socket debugging
+rem RHQ_SERVER_INSTALLER_JAVA_OPTS=%RHQ_SERVER_INSTALLER_JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
+
+if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_JAVA_OPTS: %RHQ_SERVER_INSTALLER_JAVA_OPTS%
+if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS: %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS%
+
+rem ----------------------------------------------------------------------
+rem We need to add our own modules to the core set of JBossAS modules.
+rem ----------------------------------------------------------------------
+set _RHQ_MODULES_PATH=%RHQ_SERVER_HOME%\modules
+set _INTERNAL_MODULES_PATH=%RHQ_SERVER_HOME%\jbossas\modules
+set _JBOSS_MODULEPATH=%_RHQ_MODULES_PATH%;%_INTERNAL_MODULES_PATH%
+if defined RHQ_SERVER_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH%
+
+echo Starting RHQ Server installer ...
+
+rem start the AS instance with our main installer module
+%RHQ_SERVER_JAVA_EXE_FILE_PATH% %RHQ_SERVER_INSTALLER_JAVA_OPTS% %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar %RHQ_SERVER_HOME%\jbossas\jboss-modules.jar -mp %_JBOSS_MODULEPATH% org.rhq.rhq-installer-util %*
+
+goto :done
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that prepares to use the embedded JRE
+rem ----------------------------------------------------------------------
+
+:prepare_embedded_jre
+set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre
+if defined RHQ_SERVER_DEBUG echo Using the embedded JRE
+if not exist "%RHQ_SERVER_JAVA_HOME%" (
+ if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
+ set RHQ_SERVER_JAVA_HOME=%JAVA_HOME%
+)
+goto :eof
+
+rem ----------------------------------------------------------------------
+rem CALL subroutine that exits this script normally
+rem ----------------------------------------------------------------------
+
+:done
+endlocal
11 years
[rhq] Branch 'release/jon3.1.x' - modules/enterprise
by Jiri Kremser
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 30 +++++++++-
1 file changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 51ec62419fca40fb15a2b845b2ee0938d1fd30e9
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Nov 30 22:06:52 2012 +0100
[BZ 850818 - Globally uncaught exception on clicking OK button while adding CLI Script alert notification to the alert definition] Same changes as in commit 618b064ab399d0b92dd827158234de4629cba403 except of usage of SortedSelectItem
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
index cf66856..c34fa20 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
@@ -178,8 +178,9 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm {
}
};
- private boolean formBuilt;
+ private static String FAILED_LAST_TIME = "failed";
+ private boolean formBuilt;
private SelectItem repoSelector;
private RadioGroupWithComponentsItem packageSelector;
private SelectItem existingPackageSelector;
@@ -403,10 +404,19 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm {
private void validatePackage(final AsyncCallback<Void> callback) {
if (config.selectedRepo == null) {
- repoSelector.setIcons(failureIcon);
+ setFailed(repoSelector);
callback.onFailure(null);
return;
}
+ setOk(repoSelector);
+ if (!existingPackageSelector.isDisabled()) {
+ if (config.selectedPackage == null) {
+ setFailed(existingPackageSelector);
+ callback.onFailure(null);
+ return;
+ }
+ setOk(existingPackageSelector);
+ }
getConfiguration().put(new PropertySimple(PROP_REPO_ID, config.selectedRepo.getId()));
if (packageSelector.getSelectedIndex() == 0) {
@@ -417,7 +427,8 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm {
if (cliScriptPackageType.getVersionFormat() != null) {
String versionRegex = cliScriptPackageType.getVersionFormat().getFullFormatRegex();
if (versionRegex != null) {
- if (!matches(uploadForm.getField("version").getValue().toString(), versionRegex)) {
+ Object version = uploadForm.getField("version").getValue();
+ if (version == null ||!matches(version.toString(), versionRegex)) {
uploadForm.getItem("editableVersion").setIcons(failureIcon);
callback.onFailure(null);
return;
@@ -679,6 +690,19 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm {
GWTServiceLookup.getContentService().findPackageType(null, PACKAGE_TYPE_NAME, handler);
}
+ private void setFailed(FormItem item) {
+ item.setIcons(failureIcon);
+ item.setAttribute(FAILED_LAST_TIME, true);
+ }
+
+ private void setOk(FormItem item) {
+ Boolean lastTimeFail = item.getAttributeAsBoolean(FAILED_LAST_TIME);
+ if (lastTimeFail != null && lastTimeFail) {
+ item.setIcons(successIcon);
+ item.setAttribute(FAILED_LAST_TIME, false);
+ }
+ }
+
private void checkAuthenticationAndDo(final AsyncCallback<Void> action) {
String username = anotherUserName.getEnteredValue();
String password = anotherUserPassword.getEnteredValue();
11 years
[rhq] Branch 'rhq-on-as7' - 2 commits - pom.xml
by mazz
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 54d5bcbe908c2ab6fad13cc1f641d66c7a35ad11
Merge: b396842 48ca15b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 15:43:06 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
commit 48ca15b5be083629a1529b069fda928576046ac8
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 30 14:21:27 2012 -0600
Force versions 1.3.1 until upstream JIRA for the plugin is resolved.
http://jira.codehaus.org/browse/MVERSIONS-201
diff --git a/pom.xml b/pom.xml
index 57be9a8..6af4a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -814,6 +814,11 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
</plugin>
11 years
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh | 101 +++++++---
1 file changed, 76 insertions(+), 25 deletions(-)
New commits:
commit b39684227421d5a09fe0ab5d0b932d45179fefc2
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Nov 30 15:39:20 2012 -0500
all a user to point to an external JBossAS installation via JBOSS_HOME or RHQ_SERVER_JBOSS_HOME
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
index dc93347..e917230 100644
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh
@@ -25,6 +25,13 @@
# If not defined, it will be assumed to be the parent
# directory of the directory where this script lives.
#
+# RHQ_SERVER_JBOSS_HOME - The location of the AS instance that will
+# host RHQ. If this is set, it overrides any
+# JBOSS_HOME that might be set. If this not
+# set, JBOSS_HOME is used as a fallback. If
+# neither is set, it is assumed the AS bundled
+# under RHQ_SERVER_HOME/jbossas is to be used.
+#
# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will
# use. This will be ignored if
# RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
@@ -107,17 +114,6 @@
#export LD_LIBRARY_PATH="$JPROFILER_HOME/bin/linux-x64"
# ----------------------------------------------------------------------
-# Make sure we unset any lingering JBossAS environment variables that
-# were set in the user's environment. This might happen if the user
-# has an external JBossAS configured.
-# ----------------------------------------------------------------------
-
-unset JBOSS_HOME
-unset RUN_CONF
-unset JAVAC_JAR
-unset JBOSS_CLASSPATH
-
-# ----------------------------------------------------------------------
# Dumps a message iff debug mode is enabled
# ----------------------------------------------------------------------
@@ -182,6 +178,22 @@ remove_pid_files ()
}
# ----------------------------------------------------------------------
+# Unset any lingering JBossAS environment variables that were set in
+# the user's environment. This might happen if the user has an external
+# JBossAS installed and configured but doesn't want RHQ to use it.
+# ----------------------------------------------------------------------
+unset_jboss_as_env ()
+{
+ unset JBOSS_HOME
+ unset RUN_CONF
+ unset JAVAC_JAR
+ unset JBOSS_CLASSPATH
+ unset JBOSS_BASE_DIR
+ unset JBOSS_LOG_DIR
+ unset JBOSS_CONFIG_DIR
+}
+
+# ----------------------------------------------------------------------
# Determine what specific platform we are running on.
# Set some platform-specific variables.
# ----------------------------------------------------------------------
@@ -199,6 +211,11 @@ case "`uname`" in
;;
esac
+# only certain platforms support the -e argument for readlink
+if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
+ _READLINK_ARG="-e"
+fi
+
# ----------------------------------------------------------------------
# Determine the RHQ Server installation directory.
# If RHQ_SERVER_HOME is not defined, we will assume we are running
@@ -206,10 +223,6 @@ esac
# ----------------------------------------------------------------------
if [ -z "$RHQ_SERVER_HOME" ]; then
- if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
- # only certain platforms support the -e argument for readlink
- _READLINK_ARG="-e"
- fi
_DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/..
else
@@ -225,9 +238,45 @@ RHQ_SERVER_HOME=`pwd`
debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
-if [ ! -f "${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar" ]; then
- echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ Server"
- echo "Missing ${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar"
+# ----------------------------------------------------------------------
+# Determine what JBossAS instance to use.
+# If RHQ_SERVER_JBOSS_HOME and JBOSS_HOME are both not defined, we will
+# assume we are to run the embedded AS instance from the RHQ
+# installation directory - RHQ_SERVER_HOME/jbossas
+# ----------------------------------------------------------------------
+
+if [ -z "$RHQ_SERVER_JBOSS_HOME" ]; then
+ if [ -z "$JBOSS_HOME" ]; then
+ RHQ_SERVER_JBOSS_HOME="${RHQ_SERVER_HOME}/jbossas"
+ # Unset any lingering JBossAS environment variables that we don't want.
+ # These could be in the user's environment for an external AS install.
+ unset_jboss_as_env
+ else
+ if [ ! -d "$JBOSS_HOME" ]; then
+ echo "ERROR! JBOSS_HOME is not pointing to a valid AS directory"
+ echo "JBOSS_HOME: $JBOSS_HOME"
+ exit 1
+ fi
+ RHQ_SERVER_JBOSS_HOME="${JBOSS_HOME}"
+ fi
+else
+ if [ ! -d "$RHQ_SERVER_JBOSS_HOME" ]; then
+ echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid AS directory"
+ echo "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME"
+ exit 1
+ fi
+ unset_jboss_as_env
+fi
+
+cd "$RHQ_SERVER_JBOSS_HOME"
+RHQ_SERVER_JBOSS_HOME=`pwd`
+
+debug_msg "RHQ_SERVER_JBOSS_HOME: $RHQ_SERVER_JBOSS_HOME"
+
+
+if [ ! -f "${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar" ]; then
+ echo "ERROR! RHQ_SERVER_JBOSS_HOME is not pointing to a valid RHQ Server"
+ echo "Missing ${RHQ_SERVER_JBOSS_HOME}/jboss-modules.jar"
exit 1
fi
@@ -242,7 +291,10 @@ if [ -z "$JAVA_HOME" ]; then
fi
fi
+# ----------------------------------------------------------------------
# create the logs directory
+# ----------------------------------------------------------------------
+
_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs"
if [ -n "$_CYGWIN" ]; then
_LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"`
@@ -335,7 +387,7 @@ _CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS"
# JBOSS_MODULEPATH tells standalone.sh what to use.
# ----------------------------------------------------------------------
_RHQ_MODULES_PATH="${RHQ_SERVER_HOME}/modules"
-_INTERNAL_MODULES_PATH="${RHQ_SERVER_HOME}/jbossas/modules"
+_INTERNAL_MODULES_PATH="${RHQ_SERVER_JBOSS_HOME}/modules"
if [ -n "$_CYGWIN" ]; then
_RHQ_MODULES_PATH=`cygpath --windows --path "$_RHQ_MODULES_PATH"`
_INTERNAL_MODULES_PATH=`cygpath --windows --path "$_INTERNAL_MODULES_PATH"`
@@ -348,7 +400,7 @@ debug_msg "JBOSS_MODULEPATH: $JBOSS_MODULEPATH"
# Now find the JBossAS standalone.sh script
# ----------------------------------------------------------------------
-_JBOSS_RUN_SCRIPT="${RHQ_SERVER_HOME}/jbossas/bin/standalone.sh"
+_JBOSS_RUN_SCRIPT="${RHQ_SERVER_JBOSS_HOME}/bin/standalone.sh"
if [ ! -f "$_JBOSS_RUN_SCRIPT" ]; then
echo "ERROR! Cannot find the JBossAS run script"
@@ -392,7 +444,7 @@ case "$1" in
echo "$$" > "$_JVM_PIDFILE"
# start the server, making sure its working directory is the JBossAS bin directory
- cd "${RHQ_SERVER_HOME}/jbossas/bin"
+ cd "${RHQ_SERVER_JBOSS_HOME}/bin"
"$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS
_JBOSS_STATUS=$?
@@ -416,7 +468,7 @@ case "$1" in
export JBOSS_PIDFILE
# start the server, making sure its working directory is the JBossAS bin directory
- cd "${RHQ_SERVER_HOME}/jbossas/bin"
+ cd "${RHQ_SERVER_JBOSS_HOME}/bin"
if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
"$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS &
else
@@ -498,8 +550,8 @@ case "$1" in
fi
echo "Cleaning data, tmp and log directories..."
- rm -rf "${RHQ_SERVER_HOME}/jbossas/standalone/data"
- rm -rf "${RHQ_SERVER_HOME}/jbossas/standalone/tmp"
+ rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/data"
+ rm -rf "${RHQ_SERVER_JBOSS_HOME}/standalone/tmp"
rm -rf "${RHQ_SERVER_HOME}/logs"
;;
@@ -514,4 +566,3 @@ case "$1" in
exit 1
;;
esac
-
11 years
[rhq] Branch 'release/jon3.1.x' - 2 commits - modules/plugins
by Simeon Pinder
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 32 ++++++----
1 file changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 10b02ff05c15e2cdf368ff617f0cdf48a6bf03eb
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Tue Sep 11 17:38:54 2012 -0400
[BZ 839087] add support for ConnectorAddress naming as well.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index c6bd5e7..1619b67 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -518,14 +518,19 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
switch (key.getType()) {
case Legacy: // implies main classname was not found. Include earlier naming format as well.
- name.append("JMX Server (" + key.getJmxRemotingPort() + ")");//
+ name.append("JMX Server (" + key.getJmxRemotingPort() + ")");
break;
- case JmxRemotingPort:
- name.append(':').append(key.getJmxRemotingPort()); break;
- case Explicit:
- name.append(' ').append(key.getExplicitValue()); break;
- default:
- throw new IllegalStateException("Unsupported key type: " + key.getType());
+ case ConnectorAddress:
+ name.append(key.getConnectorAddress());
+ break;
+ case JmxRemotingPort:
+ name.append(':').append(key.getJmxRemotingPort());
+ break;
+ case Explicit:
+ name.append(' ').append(key.getExplicitValue());
+ break;
+ default:
+ throw new IllegalStateException("Unsupported key type: " + key.getType());
}
return name.toString();
commit fbb56423a291d67900f3221901afa50e410d2052
Author: Elias Ross <genman(a)noderunner.net>
Date: Mon Sep 10 17:34:27 2012 -0400
[BZ 839087] adding support for Legacy types when generating names for discovered types.
- also applying original naming scheme for consistency.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index 4ce9bc2..c6bd5e7 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -46,6 +46,12 @@ import javax.management.remote.JMXServiceURL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.mc4j.ems.connection.EmsConnection;
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.mc4j.ems.connection.support.ConnectionProvider;
+import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.resource.ResourceUpgradeReport;
@@ -63,12 +69,6 @@ import org.rhq.plugins.jmx.util.ConnectionProviderFactory;
import org.rhq.plugins.jmx.util.JvmResourceKey;
import org.rhq.plugins.jmx.util.JvmUtility;
-import org.mc4j.ems.connection.EmsConnection;
-import org.mc4j.ems.connection.bean.EmsBean;
-import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
-import org.mc4j.ems.connection.support.ConnectionProvider;
-import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
-
/**
* This component will discover JVM processes that appear to be long-running (i.e. "servers"). Specifically, it will
* discover java processes that:
@@ -517,6 +517,9 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
switch (key.getType()) {
+ case Legacy: // implies main classname was not found. Include earlier naming format as well.
+ name.append("JMX Server (" + key.getJmxRemotingPort() + ")");//
+ break;
case JmxRemotingPort:
name.append(':').append(key.getJmxRemotingPort()); break;
case Explicit:
11 years
[rhq] pom.xml
by snegrea
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 48ca15b5be083629a1529b069fda928576046ac8
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Nov 30 14:21:27 2012 -0600
Force versions 1.3.1 until upstream JIRA for the plugin is resolved.
http://jira.codehaus.org/browse/MVERSIONS-201
diff --git a/pom.xml b/pom.xml
index 57be9a8..6af4a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -814,6 +814,11 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
</plugin>
11 years