[rhq] Branch 'bug/rhq-1' - 4 commits - modules/core modules/helpers
by mazz
modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java | 2
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/AbstractIgnoreTypesInventoryManagerBaseTest.java | 257 ++++++++++
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/CommitThenIgnoreTypesInventoryManagerTest.java | 67 ++
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/IgnoreTypesInventoryManagerTest.java | 217 --------
modules/helpers/rest-docs-generator/pom.xml | 65 +-
5 files changed, 372 insertions(+), 236 deletions(-)
New commits:
commit caaf437cf41cb921d1552f1b446139f946a60937
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 13:20:46 2013 -0400
BZ 535289 - more tests.
NOTE - plugin-container-itests test suite fails. there is a problem in
the arquillian/PC test framework where tests step on each other.
this needs to be fixed in order for these two new tests to not clobber
other tests. FWIW, these two new tests pass individually.
diff --git a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/AbstractIgnoreTypesInventoryManagerBaseTest.java b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/AbstractIgnoreTypesInventoryManagerBaseTest.java
new file mode 100644
index 0000000..452a4ff
--- /dev/null
+++ b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/AbstractIgnoreTypesInventoryManagerBaseTest.java
@@ -0,0 +1,257 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.pc.inventory;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.testng.Assert;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+
+import org.rhq.core.clientapi.server.discovery.InventoryReport;
+import org.rhq.core.domain.discovery.MergeInventoryReportResults;
+import org.rhq.core.domain.discovery.ResourceSyncInfo;
+import org.rhq.core.domain.resource.InventoryStatus;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pc.PluginContainer;
+import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pc.inventory.testplugin.ManualAddDiscoveryComponent;
+import org.rhq.core.pc.inventory.testplugin.TestResourceComponent;
+import org.rhq.core.pc.inventory.testplugin.TestResourceDiscoveryComponent;
+import org.rhq.test.arquillian.AfterDiscovery;
+import org.rhq.test.arquillian.BeforeDiscovery;
+import org.rhq.test.arquillian.MockingServerServices;
+import org.rhq.test.shrinkwrap.RhqAgentPluginArchive;
+
+/**
+ * Base test class for testing ignoring resource types and notifying the {@link InventoryManager} about it.
+ *
+ * @author John Mazzitelli
+ */
+public abstract class AbstractIgnoreTypesInventoryManagerBaseTest extends Arquillian {
+
+ @Deployment(name = "testIgnoreTypes", order = 1)
+ @TargetsContainer("pc")
+ public static RhqAgentPluginArchive getTestPlugin() {
+ RhqAgentPluginArchive pluginJar = ShrinkWrap.create(RhqAgentPluginArchive.class, "test-plugin.jar");
+ return pluginJar.setPluginDescriptor("test-great-grandchild-discovery-plugin.xml").addClasses(
+ TestResourceDiscoveryComponent.class, TestResourceComponent.class, ManualAddDiscoveryComponent.class);
+ }
+
+ @ArquillianResource
+ private MockingServerServices serverServices;
+
+ @ArquillianResource
+ protected PluginContainerConfiguration pluginContainerConfiguration;
+
+ // for subclasses to use this, this must be exposed as a protected field - can't use a getPluginContainer() method
+ @ArquillianResource
+ protected PluginContainer pluginContainer;
+
+ protected Resource platform;
+
+ protected HashMap<String, Resource> simulatedInventory; // key == UUID
+
+ protected HashSet<ResourceType> ignoredTypes;
+
+ private CountDownLatch gotIgnoredTypeFromAgent;
+
+ protected abstract void initializeIgnoredTypes();
+
+ @BeforeDiscovery
+ public void resetServerServices() throws Exception {
+ platform = null;
+ simulatedInventory = new HashMap<String, Resource>();
+ gotIgnoredTypeFromAgent = new CountDownLatch(1); // will be open once we know agent discovered types we want ignored
+
+ initializeIgnoredTypes();
+
+ serverServices.resetMocks();
+
+ when(serverServices.getDiscoveryServerService().mergeInventoryReport(any(InventoryReport.class))).then(
+ mergeInventoryReport());
+ }
+
+ @AfterDiscovery
+ public void afterDiscovery() throws Exception {
+ // wait for agent discovery to start getting ignored types
+ // actually, I don't think this latch will ever count down - if I did this right,
+ // the first inventory report will tell the agent about the ignored types - before the agent
+ // even attempted to discover resources of that type. Therefore, the agent will probably never
+ // send up resources of the ignored types. But we have to wait anyway for the few inventory reports
+ // that have to be received (which includes the resources of the unignored types).
+ gotIgnoredTypeFromAgent.await(20L, TimeUnit.SECONDS);
+ }
+
+ protected void resetSimulatedServerSideInventory() {
+ if (simulatedInventory != null) {
+ simulatedInventory.clear();
+ }
+
+ if (platform != null) {
+ platform.getChildResources().clear();
+ if (simulatedInventory != null) {
+ simulatedInventory.put(platform.getUuid(), platform);
+ }
+ }
+ }
+
+ protected void waitForInventory(int depth) throws Exception {
+ long start = System.currentTimeMillis();
+ while (getInventoryDepth(platform) < depth) {
+ Thread.sleep(1000);
+ if (System.currentTimeMillis() - start > 30000L) {
+ break; // this should never take longer than 30s
+ }
+ }
+ return;
+ }
+
+ protected int getInventoryDepth(Resource root) {
+ if (root == null) {
+ return 0;
+ }
+ int maxDepth = 0;
+ for (Resource c : root.getChildResources()) {
+ int childDepth = getInventoryDepth(c);
+ if (maxDepth < childDepth) {
+ maxDepth = childDepth;
+ }
+ }
+ return maxDepth + 1;
+ }
+
+ protected Answer<MergeInventoryReportResults> mergeInventoryReport() {
+ return new Answer<MergeInventoryReportResults>() {
+ @Override
+ public MergeInventoryReportResults answer(InvocationOnMock invocation) throws Throwable {
+ InventoryReport inventoryReport = (InventoryReport) invocation.getArguments()[0];
+ return simulateInventoryReportServerProcessing(inventoryReport);
+ }
+ };
+ }
+
+ protected MergeInventoryReportResults simulateInventoryReportServerProcessing(InventoryReport inventoryReport) {
+ ResourceSyncInfo syncInfo = null;
+ if (inventoryReport.getAddedRoots() != null && !inventoryReport.getAddedRoots().isEmpty()) {
+ for (Resource res : inventoryReport.getAddedRoots()) {
+ persistInSimulatedInventory(res);
+ }
+ syncInfo = ResourceSyncInfo.buildResourceSyncInfo(platform);
+ }
+ return new MergeInventoryReportResults(syncInfo, ignoredTypes);
+ }
+
+ protected void persistInSimulatedInventory(Resource res) {
+ if (!ignoredTypes.contains(res.getResourceType())) {
+ if (!simulatedInventory.containsKey(res.getUuid())) {
+ Resource persisted = new Resource(res.getResourceKey(), res.getName(), res.getResourceType());
+ persisted.setUuid(res.getUuid());
+ persisted.setInventoryStatus(InventoryStatus.COMMITTED);
+ simulatedInventory.put(persisted.getUuid(), persisted);
+ if (res.getParentResource() == Resource.ROOT) {
+ platform = persisted;
+ } else {
+ Resource parent = simulatedInventory.get(res.getParentResource().getUuid());
+ if (parent != null) {
+ parent.addChildResource(persisted);
+ }
+ }
+ }
+ for (Resource child : res.getChildResources()) {
+ persistInSimulatedInventory(child);
+ }
+ } else {
+ gotIgnoredTypeFromAgent.countDown();
+ }
+ return;
+ }
+
+ protected void validateFullInventory() {
+ System.out.println("Validating full inventory...");
+
+ // get platform
+ Resource platform = pluginContainer.getInventoryManager().getPlatform();
+ Assert.assertNotNull(platform);
+ Assert.assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server
+ Assert.assertEquals(platform.getChildResources().size(), 1, "plat children: " + platform.getChildResources());
+ Resource server = platform.getChildResources().iterator().next();
+ Assert.assertNotNull(server);
+ Assert.assertEquals(server.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server's immediate child service
+ Assert.assertEquals(server.getChildResources().size(), 1, "srv children: " + server.getChildResources());
+ Resource service = server.getChildResources().iterator().next();
+ Assert.assertNotNull(service);
+ Assert.assertEquals(service.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server's grandchild service
+ Assert.assertEquals(service.getChildResources().size(), 1, "svc children: " + service.getChildResources());
+ Resource grandchild = service.getChildResources().iterator().next();
+ Assert.assertNotNull(grandchild);
+ Assert.assertEquals(grandchild.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server's great-grandchild service
+ Assert.assertEquals(grandchild.getChildResources().size(), 1, "svc grandch: " + grandchild.getChildResources());
+ Resource greatgrandchild = grandchild.getChildResources().iterator().next();
+ Assert.assertNotNull(greatgrandchild);
+ Assert.assertEquals(greatgrandchild.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ assert greatgrandchild.getChildResources().isEmpty() : "great grandchild should have no children";
+ }
+
+ protected void validatePartiallyIgnoredInventory() {
+ System.out.println("Validating partially ignored inventory...");
+
+ // get platform
+ Resource platform = pluginContainer.getInventoryManager().getPlatform();
+ Assert.assertNotNull(platform);
+ Assert.assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server
+ Assert.assertEquals(platform.getChildResources().size(), 1, "plat children: " + platform.getChildResources());
+ Resource server = platform.getChildResources().iterator().next();
+ Assert.assertNotNull(server);
+ Assert.assertEquals(server.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // get top server's immediate child service
+ Assert.assertEquals(server.getChildResources().size(), 1, "srv children: " + server.getChildResources());
+ Resource service = server.getChildResources().iterator().next();
+ Assert.assertNotNull(service);
+ Assert.assertEquals(service.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ // the grandchild service type is ignored, we should have no children from here on down
+ assert service.getChildResources().isEmpty() : "grandchild should have been ignored";
+ }
+}
diff --git a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/CommitThenIgnoreTypesInventoryManagerTest.java b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/CommitThenIgnoreTypesInventoryManagerTest.java
new file mode 100644
index 0000000..65c9ab7
--- /dev/null
+++ b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/CommitThenIgnoreTypesInventoryManagerTest.java
@@ -0,0 +1,67 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.pc.inventory;
+
+import java.util.HashSet;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.clientapi.server.discovery.InventoryReport;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.test.arquillian.RunDiscovery;
+
+/**
+ * Tests committing a full inventory then having resource types ignored server-side and
+ * watching that the agent is told about that and that the ignored resources are removed
+ * from agent inventory.
+ *
+ * @author John Mazzitelli
+ */
+@Test(groups = { "ignoreTypesTests" }, singleThreaded = true)
+public class CommitThenIgnoreTypesInventoryManagerTest extends AbstractIgnoreTypesInventoryManagerBaseTest {
+
+ protected void initializeIgnoredTypes() {
+ this.ignoredTypes = new HashSet<ResourceType>();
+ return;
+ }
+
+ @RunDiscovery
+ public void testIgnoreTypesAfterFullCommit() throws Exception {
+ // make sure the agent inventory has a full inventory
+ validateFullInventory();
+
+ // simulate the ignoring of types
+ resetSimulatedServerSideInventory();
+ ignoredTypes.add(new ResourceType("Test Service GrandChild", "test", null, null));
+ ignoredTypes.add(new ResourceType("Manual Add Server", "test", null, null));
+
+ // the agent side will have the committed resources removed when they are ignored by the server
+ InventoryManager inventoryManager = this.pluginContainer.getInventoryManager();
+ inventoryManager.getPlatform().getChildResources().clear(); // just clear everything, sync'ing should give us back unignored ones
+
+ // Now execute a full discovery again, this time, we should see the ignored resources go away
+ System.out.println("Executing full discovery...");
+ InventoryReport report = inventoryManager.executeServerScanImmediately();
+ inventoryManager.handleReport(report);
+ report = inventoryManager.executeServiceScanImmediately();
+ inventoryManager.handleReport(report);
+ waitForInventory(3);
+ validatePartiallyIgnoredInventory();
+ }
+}
diff --git a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/IgnoreTypesInventoryManagerTest.java b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/IgnoreTypesInventoryManagerTest.java
index 682b63a..fc9b610 100644
--- a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/IgnoreTypesInventoryManagerTest.java
+++ b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/IgnoreTypesInventoryManagerTest.java
@@ -18,103 +18,30 @@
*/
package org.rhq.core.pc.inventory;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.testng.Assert;
import org.testng.annotations.Test;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-
import org.rhq.core.clientapi.server.discovery.InventoryReport;
-import org.rhq.core.domain.discovery.MergeInventoryReportResults;
-import org.rhq.core.domain.discovery.ResourceSyncInfo;
-import org.rhq.core.domain.resource.InventoryStatus;
-import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.pc.PluginContainer;
-import org.rhq.core.pc.PluginContainerConfiguration;
-import org.rhq.core.pc.inventory.testplugin.ManualAddDiscoveryComponent;
-import org.rhq.core.pc.inventory.testplugin.TestResourceComponent;
-import org.rhq.core.pc.inventory.testplugin.TestResourceDiscoveryComponent;
-import org.rhq.test.arquillian.AfterDiscovery;
-import org.rhq.test.arquillian.BeforeDiscovery;
-import org.rhq.test.arquillian.MockingServerServices;
import org.rhq.test.arquillian.RunDiscovery;
-import org.rhq.test.shrinkwrap.RhqAgentPluginArchive;
/**
* Test the server ignoring resource types and notifying the {@link InventoryManager} about it.
*
* @author John Mazzitelli
*/
-@RunDiscovery
-public class IgnoreTypesInventoryManagerTest extends Arquillian {
-
- @Deployment(name = "test")
- @TargetsContainer("pc")
- public static RhqAgentPluginArchive getTestPlugin() {
- RhqAgentPluginArchive pluginJar = ShrinkWrap.create(RhqAgentPluginArchive.class, "test-plugin.jar");
- return pluginJar.setPluginDescriptor("test-great-grandchild-discovery-plugin.xml").addClasses(
- TestResourceDiscoveryComponent.class, TestResourceComponent.class, ManualAddDiscoveryComponent.class);
- }
-
- @ArquillianResource
- private MockingServerServices serverServices;
-
- @ArquillianResource
- private PluginContainerConfiguration pluginContainerConfiguration;
-
- @ArquillianResource
- private PluginContainer pluginContainer;
-
- private Resource platform;
- private HashMap<String, Resource> simulatedInventory; // key == UUID
-
- private Collection<ResourceType> ignoredTypes;
-
- private CountDownLatch gotIgnoredTypeFromAgent;
-
- @BeforeDiscovery
- public void resetServerServices() throws Exception {
- platform = null;
- simulatedInventory = new HashMap<String, Resource>();
- gotIgnoredTypeFromAgent = new CountDownLatch(1); // will be open once we know agent discovered types we want ignored
+@Test(groups = { "ignoreTypesTests" }, singleThreaded = true)
+public class IgnoreTypesInventoryManagerTest extends AbstractIgnoreTypesInventoryManagerBaseTest {
- ignoredTypes = new HashSet<ResourceType>();
+ protected void initializeIgnoredTypes() {
+ this.ignoredTypes = new HashSet<ResourceType>();
ignoredTypes.add(new ResourceType("Test Service GrandChild", "test", null, null));
ignoredTypes.add(new ResourceType("Manual Add Server", "test", null, null));
-
- serverServices.resetMocks();
-
- when(serverServices.getDiscoveryServerService().mergeInventoryReport(any(InventoryReport.class))).then(
- mergeInventoryReport());
- }
-
- @AfterDiscovery
- public void afterDiscovery() throws Exception {
- // wait for agent discovery to start getting ignored types
- // actually, I don't think this latch will ever count down - if I did this right,
- // the first inventory report will tell the agent about the ignored types - before the agent
- // even attempted to discover resources of that type. Therefore, the agent will probably never
- // send up resources of the ignored types. But we have to wait anyway for the few inventory reports
- // that have to be received (which includes the resources of the unignored types).
- gotIgnoredTypeFromAgent.await(20L, TimeUnit.SECONDS);
+ return;
}
- @Test
+ @RunDiscovery
public void testIgnoreTypes() throws Exception {
// make sure the agent inventory does not have any resources of the ignored types
validatePartiallyIgnoredInventory();
@@ -124,140 +51,12 @@ public class IgnoreTypesInventoryManagerTest extends Arquillian {
// Now execute a full discovery again, this time, we should see the full inventory come in
System.out.println("Executing full discovery...");
- InventoryManager inventoryManager = pluginContainer.getInventoryManager();
+ InventoryManager inventoryManager = this.pluginContainer.getInventoryManager();
InventoryReport report = inventoryManager.executeServerScanImmediately();
inventoryManager.handleReport(report);
report = inventoryManager.executeServiceScanImmediately();
inventoryManager.handleReport(report);
- waitForFullInventory();
+ waitForInventory(5);
validateFullInventory();
}
-
- private void waitForFullInventory() throws Exception {
- long start = System.currentTimeMillis();
- while (getInventoryDepth(platform) < 5) {
- Thread.sleep(1000);
- if (System.currentTimeMillis() - start > 30000L) {
- break; // this should never take longer than 30s
- }
- }
- return;
- }
-
- private int getInventoryDepth(Resource root) {
- if (root == null) {
- return 0;
- }
- int maxDepth = 0;
- for (Resource c : root.getChildResources()) {
- int childDepth = getInventoryDepth(c);
- if (maxDepth < childDepth) {
- maxDepth = childDepth;
- }
- }
- return maxDepth + 1;
- }
-
- private Answer<MergeInventoryReportResults> mergeInventoryReport() {
- return new Answer<MergeInventoryReportResults>() {
- @Override
- public MergeInventoryReportResults answer(InvocationOnMock invocation) throws Throwable {
- InventoryReport inventoryReport = (InventoryReport) invocation.getArguments()[0];
- return simulateInventoryReportServerProcessing(inventoryReport);
- }
- };
- }
-
- private MergeInventoryReportResults simulateInventoryReportServerProcessing(InventoryReport inventoryReport) {
- ResourceSyncInfo syncInfo = null;
- if (inventoryReport.getAddedRoots() != null && !inventoryReport.getAddedRoots().isEmpty()) {
- for (Resource res : inventoryReport.getAddedRoots()) {
- persistInSimulatedInventory(res);
- }
- syncInfo = ResourceSyncInfo.buildResourceSyncInfo(platform);
- }
- return new MergeInventoryReportResults(syncInfo, ignoredTypes);
- }
-
- private void persistInSimulatedInventory(Resource res) {
- if (!ignoredTypes.contains(res.getResourceType())) {
- if (!simulatedInventory.containsKey(res.getUuid())) {
- Resource persisted = new Resource(res.getResourceKey(), res.getName(), res.getResourceType());
- persisted.setUuid(res.getUuid());
- persisted.setInventoryStatus(InventoryStatus.COMMITTED);
- simulatedInventory.put(persisted.getUuid(), persisted);
- if (res.getParentResource() == Resource.ROOT) {
- platform = persisted;
- } else {
- Resource parent = simulatedInventory.get(res.getParentResource().getUuid());
- parent.addChildResource(persisted);
- }
- }
- for (Resource child : res.getChildResources()) {
- persistInSimulatedInventory(child);
- }
- } else {
- gotIgnoredTypeFromAgent.countDown();
- }
- return;
- }
-
- private void validateFullInventory() {
- System.out.println("Validating full inventory...");
-
- // get platform
- Resource platform = pluginContainer.getInventoryManager().getPlatform();
- Assert.assertNotNull(platform);
- Assert.assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server
- Assert.assertEquals(platform.getChildResources().size(), 1, "plat children: " + platform.getChildResources());
- Resource server = platform.getChildResources().iterator().next();
- Assert.assertNotNull(server);
- Assert.assertEquals(server.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server's immediate child service
- Assert.assertEquals(server.getChildResources().size(), 1, "srv children: " + server.getChildResources());
- Resource service = server.getChildResources().iterator().next();
- Assert.assertNotNull(service);
- Assert.assertEquals(service.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server's grandchild service
- Assert.assertEquals(service.getChildResources().size(), 1, "svc children: " + service.getChildResources());
- Resource grandchild = service.getChildResources().iterator().next();
- Assert.assertNotNull(grandchild);
- Assert.assertEquals(grandchild.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server's great-grandchild service
- Assert.assertEquals(grandchild.getChildResources().size(), 1, "svc grandch: " + grandchild.getChildResources());
- Resource greatgrandchild = grandchild.getChildResources().iterator().next();
- Assert.assertNotNull(greatgrandchild);
- Assert.assertEquals(greatgrandchild.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- assert greatgrandchild.getChildResources().isEmpty() : "great grandchild should have no children";
- }
-
- private void validatePartiallyIgnoredInventory() {
- System.out.println("Validating partially ignored inventory...");
-
- // get platform
- Resource platform = pluginContainer.getInventoryManager().getPlatform();
- Assert.assertNotNull(platform);
- Assert.assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server
- Assert.assertEquals(platform.getChildResources().size(), 1, "plat children: " + platform.getChildResources());
- Resource server = platform.getChildResources().iterator().next();
- Assert.assertNotNull(server);
- Assert.assertEquals(server.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // get top server's immediate child service
- Assert.assertEquals(server.getChildResources().size(), 1, "srv children: " + server.getChildResources());
- Resource service = server.getChildResources().iterator().next();
- Assert.assertNotNull(service);
- Assert.assertEquals(service.getInventoryStatus(), InventoryStatus.COMMITTED);
-
- // the grandchild service type is ignored, we should have no children from here on down
- assert service.getChildResources().isEmpty() : "grandchild should have been ignored";
- }
}
commit 62efaabe0874ddf660d5e14e96fe888d50de9556
Merge: 086ce6d 08d1940
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Mar 25 12:02:56 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 08d1940f310b9bf4089c59b4582039a2c4ade939
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Mar 25 12:01:29 2013 -0400
provide cause when this error happens
diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java
index 82e64bb..aefad84 100644
--- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java
+++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java
@@ -66,7 +66,7 @@ public class PluginContainerClassEnhancer {
pcClass.toClass(cl, null);
} catch (Exception e) {
- throw new IllegalStateException("Could not enhance the PluginContaier class");
+ throw new IllegalStateException("Could not enhance the PluginContainer class", e);
} finally {
initialized = true;
}
commit 93fe7c6c3d209598480d4bb06d1b537c1309d575
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Mar 25 11:24:15 2013 +0100
Use the maven compiler plugin instead of the (outdated) bsc annotation processor
diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml
index 208d40b..1dff5bd 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ RHQ Management Platform
- ~ Copyright (C) 2005-2012 Red Hat, Inc.
+ ~ Copyright (C) 2005-2013 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
@@ -14,8 +14,8 @@
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
- ~ along with this program; if not, write to the Free Software
- ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ ~ along with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -49,43 +49,56 @@
<plugins>
<plugin>
- <groupId>org.bsc.maven</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <version>2.0.6-redhat</version>
- <configuration>
- <processors>
- <processor>org.rhq.helpers.rest_docs_generator.ClassLevelProcessor</processor>
- </processors>
- <compilerArguments>-AtargetDirectory=${project.build.directory}/docs/xml</compilerArguments>
- <!-- comment in next line to get the xml on stdout for debugging -->
- <!--<compilerArguments>-Averbose=true</compilerArguments>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
<executions>
<execution>
- <id>create-rest-api-report</id>
- <phase>process-classes</phase>
+ <!-- Compile the sources i.e. the processor plugin-->
+ <id>compile-processor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <proc>none</proc>
+ <verbose>false</verbose>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- Execute the compiled plugin on the test sources -->
+ <id>create-rest-api-reports</id>
+ <phase>process-test-classes</phase>
<goals>
<!-- We want to process the classes in test/ -->
- <goal>process-test</goal>
+ <goal>testCompile</goal>
</goals>
+ <configuration>
+ <annotationProcessors>
+ <processor>org.rhq.helpers.rest_docs_generator.ClassLevelProcessor</processor>
+ </annotationProcessors>
+ <proc>only</proc>
+ <compilerArguments>
+ <AtargetDirectory>${project.build.directory}/docs/xml</AtargetDirectory>
+ <AmodelPkg>org.rhq.helpers.rest_docs_generator.test</AmodelPkg>
+ <!-- enable the next line to have the output of the processor shown on console -->
+ <!--<Averbose>true</Averbose>-->
+ </compilerArguments>
+ <!-- set the next to true to enable verbose output of the compiler plugin; default from the evn is true, but this is too noisy -->
+ <verbose>false</verbose>
+ </configuration>
+
</execution>
</executions>
</plugin>
- <!-- Disable annotation processors during normal compilation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-proc:none</compilerArgument>
- </configuration>
- </plugin>
+
<!-- now xml translate the output from above to html -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
+ <phase>process-test-classes</phase>
<goals>
<goal>transform</goal>
</goals>
11 years, 1 month
- 1
- 0
[rhq] Changes to 'bug/927868'
by Heiko W. Rupp
New branch 'bug/927868' available with the following commits:
commit 8f30c4187b0af4d6e6b4c67d0e898caddd12320c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Mar 26 17:53:11 2013 +0100
Initial set of changes to get RHQ running on EAP 6.1alpha1 for a fresh install.
11 years, 1 month
- 1
- 0
[rhq] modules/core modules/enterprise
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java | 7 ++++---
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 5 ++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java | 3 +--
5 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit dc604ae17d538a129371f1bf9fbe8e324d1f4e5e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 12:12:35 2013 -0400
Revert "do not pass not-yet-fully-initialized "this" reference to GroupOperationHistory.addResourceOperationHistory() in ResourceOperationHistory's constructor, as the GWT compiler fails when it sees this (at least in my OS X 10.7.5, Oracle JDK 1.7.0_17 environment)"
This reverts commit df18b71df2d5114d9edc8a26ad42e0d7a9036eb2.
Charles asked that I revert this.
Reverting for a couple reasons:
* This broke a jenkins build - an API change has been introduced and it therefore fails the API check job. (I think its due to a change in a public domain object's constructor).
* Also, There is no BZ for this - we don't know what this addressed.
Ian - feel free to commit this back in a branch (not master) and create a BZ for
this. We'll cherry pick in master at the appropriate time.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
index 08611ac..08c29be 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
@@ -126,11 +126,12 @@ public class ResourceOperationHistory extends OperationHistory {
protected ResourceOperationHistory() {
}
- public ResourceOperationHistory(
- String jobName, String jobGroup, String subjectName,
- OperationDefinition operationDefinition, Configuration parameters, Resource resource) {
+ public ResourceOperationHistory(String jobName, String jobGroup, String subjectName,
+ OperationDefinition operationDefinition, Configuration parameters, Resource resource,
+ GroupOperationHistory groupHistory) {
super(jobName, jobGroup, subjectName, operationDefinition, parameters);
this.resource = resource;
+ setGroupOperationHistory(groupHistory);
}
public Resource getResource() {
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
index 6ec38e5..34837a1 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
@@ -285,8 +285,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createGroupIndividualResourceHistory(GroupOperationHistory g1) {
ResourceOperationHistory r2 = new ResourceOperationHistory("job3" + System.currentTimeMillis(), "group3",
- "user", newOperation, null, newResource);
- r2.setGroupOperationHistory(g1);
+ "user", newOperation, null, newResource, g1);
r2.setStartedTime();
em.persist(r2);
return r2;
@@ -301,7 +300,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createIndividualResourceHistory() {
ResourceOperationHistory r1 = new ResourceOperationHistory("job1" + System.currentTimeMillis(), "group1",
- "user", newOperation, null, newResource);
+ "user", newOperation, null, newResource, null);
r1.setStartedTime();
em.persist(r1);
return r1;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 5b3b374..4bc457e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -149,7 +149,7 @@ public class ResourceOperationHistoryDataSource extends
@Override
protected ResourceOperationHistory createOperationHistory() {
- return new ResourceOperationHistory(null, null, null, null, null, null);
+ return new ResourceOperationHistory(null, null, null, null, null, null, null);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index dc5e887..df1e09e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -431,7 +431,7 @@ public class OperationHistoryDataSource extends
ResourceOperationHistory resourceOperationHistory = new ResourceOperationHistory(null, null,
from.getAttribute(Field.SUBJECT),
(OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION),
- (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource);
+ (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource, null);
resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID));
return resourceOperationHistory;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
index 6982d58..955de7a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
@@ -97,8 +97,7 @@ public abstract class OperationJob implements Job {
ResourceOperationHistory history;
history = new ResourceOperationHistory(jobName, jobGroup, schedule.getSubject().getName(), op, parameters,
- schedule.getResource());
- history.setGroupOperationHistory(groupHistory);
+ schedule.getResource(), groupHistory);
// persist the results of the initial create
ResourceOperationHistory persisted;
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by Jiri Kremser
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 361 +++++++++-
1 file changed, 359 insertions(+), 2 deletions(-)
New commits:
commit 87a06a50d2c0d3fe92568c6d17272f2510e7ee20
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Mar 26 15:38:43 2013 +0100
Adding integration tests for OperationManagerBean covering the scheduling using cron and other methods.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
index fe61829..a75388b 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java
@@ -18,7 +18,10 @@
*/
package org.rhq.enterprise.server.operation;
+import java.util.Arrays;
+import java.util.Calendar;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.List;
import java.util.Random;
@@ -34,6 +37,7 @@ import org.rhq.core.clientapi.agent.operation.CancelResults.InterruptedState;
import org.rhq.core.clientapi.agent.operation.OperationAgentService;
import org.rhq.core.clientapi.server.operation.OperationServerService;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.common.JobTrigger;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.operation.GroupOperationHistory;
@@ -502,7 +506,7 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
}
@Test(enabled = ENABLE_TESTS)
- public void testScheduleGroupOperation() throws Exception {
+ public void testScheduleGroupOperation1() throws Exception {
// make it a success
simulatedOperation_Error = null;
simulatedOperation_Timeout = false;
@@ -571,6 +575,160 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
list = operationManager.findRecentlyCompletedGroupOperations(overlord, PageControl.getUnlimitedInstance());
assert list.size() == 0;
}
+
+ @Test(enabled = ENABLE_TESTS)
+ public void testScheduleGroupOperation2() throws Exception {
+ // make it a success
+ simulatedOperation_Error = null;
+ simulatedOperation_Timeout = false;
+ simulatedOperation_Sleep = 0L;
+
+ GroupOperationSchedule schedule = operationManager.scheduleGroupOperation(overlord, newGroup.getId(),
+ new int[] { newResource.getId() }, true, "testOp", null, 0, 0, 0, 20, "desc");
+ assert schedule != null;
+ assert schedule.getDescription().equals("desc");
+ assert schedule.getOperationName().equals("testOp");
+ assert schedule.getParameters() != null;
+ assert schedule.getGroup().getId() == newGroup.getId();
+
+ Thread.sleep(4000L); // wait for it to finish, should be fast
+
+ PageList<GroupOperationHistory> results;
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 1;
+ GroupOperationHistory history = results.get(0);
+ assert history.getId() > 0 : history;
+ assert history.getJobId() != null : history;
+ assert history.getJobName() != null : history;
+ assert history.getJobGroup() != null : history;
+ assert history.getErrorMessage() == null : history;
+ assert history.getStatus() == OperationRequestStatus.SUCCESS : history;
+ assert history.getSubjectName().equals(overlord.getName()) : history;
+
+ PageList<GroupOperationLastCompletedComposite> list;
+ list = operationManager.findRecentlyCompletedGroupOperations(overlord, PageControl.getUnlimitedInstance());
+ assert list.size() == 1;
+ assert list.get(0).getOperationHistoryId() == history.getId();
+ assert list.get(0).getGroupId() == newGroup.getId();
+ assert list.get(0).getGroupName().equals(newGroup.getName());
+ assert list.get(0).getOperationName().equals("Test Operation");
+
+ // get the one resource history from the group
+ PageList<ResourceOperationHistory> results2;
+ results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results2.size() == 1 : "Should have had 1 result: " + results2;
+
+ ResourceOperationHistory rHistory = results2.get(0);
+ assert rHistory.getId() > 0 : rHistory;
+ assert rHistory.getJobId() != null : rHistory;
+ assert rHistory.getJobName() != null : rHistory;
+ assert rHistory.getJobGroup() != null : rHistory;
+ assert rHistory.getErrorMessage() == null : rHistory;
+ assert rHistory.getStatus() == OperationRequestStatus.SUCCESS : rHistory;
+ assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
+
+ operationManager.deleteOperationHistory(overlord, history.getId(), false);
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 0; // none left, we purged the only group history there was
+
+ // purging group history purges all resource histories that belong to it
+ results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results2 != null;
+ assert results2.size() == 0;
+
+ list = operationManager.findRecentlyCompletedGroupOperations(overlord, PageControl.getUnlimitedInstance());
+ assert list.size() == 0;
+ }
+
+ @Test(enabled = ENABLE_TESTS)
+ public void testScheduleGroupOperation3() throws Exception {
+ // make it a success
+ simulatedOperation_Error = null;
+ simulatedOperation_Timeout = false;
+ simulatedOperation_Sleep = 0L;
+
+ GroupOperationSchedule newSchedule = new GroupOperationSchedule();
+ newSchedule.setGroup(newGroup);
+ newSchedule.setExecutionOrder(Arrays.asList(newResource));
+ newSchedule.setHaltOnFailure(true);
+ newSchedule.setOperationName("testOp");
+ newSchedule.setParameters(null);
+ newSchedule.setJobTrigger(JobTrigger.createNowTrigger());
+ newSchedule.setDescription("desc");
+
+ int scheduleId = operationManager.scheduleGroupOperation(overlord, newSchedule);
+ List<GroupOperationSchedule> schedules = operationManager.findScheduledGroupOperations(overlord, newGroup.getId());
+
+ assert schedules != null;
+ assert !schedules.isEmpty();
+ GroupOperationSchedule schedule = schedules.get(0);
+ assert schedule != null;
+ assert schedule.getId() == scheduleId;
+ assert schedule.getDescription().equals("desc");
+ assert schedule.getOperationName().equals("testOp");
+ assert schedule.getParameters() == null;
+ assert schedule.getGroup().getId() == newGroup.getId();
+
+ Thread.sleep(4000L); // wait for it to finish, should be fast
+
+ PageList<GroupOperationHistory> results;
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 1;
+ GroupOperationHistory history = results.get(0);
+ assert history.getId() > 0 : history;
+ assert history.getJobId() != null : history;
+ assert history.getJobName() != null : history;
+ assert history.getJobGroup() != null : history;
+ assert history.getErrorMessage() == null : history;
+ assert history.getStatus() == OperationRequestStatus.SUCCESS : history;
+ assert history.getSubjectName().equals(overlord.getName()) : history;
+
+ PageList<GroupOperationLastCompletedComposite> list;
+ list = operationManager.findRecentlyCompletedGroupOperations(overlord, PageControl.getUnlimitedInstance());
+ assert list.size() == 1;
+ assert list.get(0).getOperationHistoryId() == history.getId();
+ assert list.get(0).getGroupId() == newGroup.getId();
+ assert list.get(0).getGroupName().equals(newGroup.getName());
+ assert list.get(0).getOperationName().equals("Test Operation");
+
+ // get the one resource history from the group
+ PageList<ResourceOperationHistory> results2;
+ results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results2.size() == 1 : "Should have had 1 result: " + results2;
+
+ ResourceOperationHistory rHistory = results2.get(0);
+ assert rHistory.getId() > 0 : rHistory;
+ assert rHistory.getJobId() != null : rHistory;
+ assert rHistory.getJobName() != null : rHistory;
+ assert rHistory.getJobGroup() != null : rHistory;
+ assert rHistory.getErrorMessage() == null : rHistory;
+ assert rHistory.getStatus() == OperationRequestStatus.SUCCESS : rHistory;
+ assert rHistory.getSubjectName().equals(overlord.getName()) : rHistory;
+
+ operationManager.deleteOperationHistory(overlord, history.getId(), false);
+ results = operationManager.findCompletedGroupOperationHistories(overlord, newGroup.getId(),
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 0; // none left, we purged the only group history there was
+
+ // purging group history purges all resource histories that belong to it
+ results2 = operationManager.findCompletedResourceOperationHistories(overlord, newResource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results2 != null;
+ assert results2.size() == 0;
+
+ list = operationManager.findRecentlyCompletedGroupOperations(overlord, PageControl.getUnlimitedInstance());
+ assert list.size() == 0;
+ }
@Test(enabled = ENABLE_TESTS)
public void testScheduleGroupOperationRecurring() throws Exception {
@@ -1258,7 +1416,7 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
}
@Test(enabled = ENABLE_TESTS)
- public void testScheduleResourceOperation() throws Exception {
+ public void testScheduleResourceOperation1() throws Exception {
Resource resource = newResource;
// make it a success after 500ms
@@ -1310,6 +1468,73 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
PageControl.getUnlimitedInstance());
assert list.size() == 0;
}
+
+ @Test(enabled = ENABLE_TESTS)
+ public void testScheduleResourceOperation2() throws Exception {
+ Resource resource = newResource;
+
+ // make it a success after 500ms
+ simulatedOperation_Error = null;
+ simulatedOperation_Timeout = false;
+ simulatedOperation_Sleep = 0L;
+
+ ResourceOperationSchedule newSchedule = new ResourceOperationSchedule();
+
+ newSchedule.setJobTrigger(JobTrigger.createNowTrigger());
+ newSchedule.setResource(resource);
+ newSchedule.setOperationName("testOp");
+ newSchedule.setDescription("desc");
+ newSchedule.setParameters(null);
+ newSchedule.setParameters(null);
+
+ int scheduleId = operationManager.scheduleResourceOperation(overlord, newSchedule);
+ List<ResourceOperationSchedule> schedules = operationManager.findScheduledResourceOperations(overlord, resource.getId());
+
+ assert schedules != null;
+ assert !schedules.isEmpty();
+ ResourceOperationSchedule schedule = schedules.get(0);
+ assert schedule != null;
+ assert schedule.getId() == scheduleId;
+ assert schedule.getDescription().equals("desc");
+ assert schedule.getOperationName().equals("testOp");
+ assert schedule.getParameters() == null;
+ assert schedule.getResource().getId() == newResource.getId();
+
+ Thread.sleep(4000L); // wait for it to finish, should be very quick
+
+ PageList<ResourceOperationHistory> results;
+ results = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 1;
+ ResourceOperationHistory history = results.get(0);
+ assert history.getId() > 0 : history;
+ assert history.getJobId() != null : history;
+ assert history.getJobName() != null : history;
+ assert history.getJobGroup() != null : history;
+ assert history.getErrorMessage() == null : history;
+ assert history.getStatus() == OperationRequestStatus.SUCCESS : history;
+ assert history.getSubjectName().equals(overlord.getName()) : history;
+
+ PageList<ResourceOperationLastCompletedComposite> list;
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 1;
+ assert list.get(0).getOperationHistoryId() == history.getId();
+ assert list.get(0).getResourceId() == resource.getId();
+ assert list.get(0).getResourceName().equals(resource.getName());
+ assert list.get(0).getOperationName().equals("Test Operation");
+
+ operationManager.deleteOperationHistory(overlord, history.getId(), false);
+ results = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert results != null;
+ assert results.size() == 0;
+
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 0;
+ }
@Test(enabled = ENABLE_TESTS)
public void testScheduleResourceOperationRecurring() throws Exception {
@@ -1531,6 +1756,138 @@ public class OperationManagerBeanTest extends AbstractEJB3Test {
new int[] { noPermSubject.getId() });
}
}
+
+ @Test(enabled = ENABLE_TESTS)
+ public void testCronResourceScheduling() throws Exception {
+ Resource resource = newResource;
+ Calendar calendar = new GregorianCalendar();
+ calendar.add(Calendar.SECOND, 2);
+ ResourceOperationSchedule schedule = operationManager.scheduleResourceOperationUsingCron(overlord,
+ resource.getId(), "testOp", calendar.get(Calendar.SECOND) + " " + calendar.get(Calendar.MINUTE)
+ + " * * * ?", 20, null, "desc");
+
+ assert schedule != null;
+ assert schedule.getDescription().equals("desc");
+ assert schedule.getOperationName().equals("testOp");
+ assert schedule.getParameters() != null;
+ assert schedule.getResource().getId() == resource.getId();
+
+ List<ResourceOperationSchedule> results;
+ results = operationManager.findScheduledResourceOperations(overlord, resource.getId());
+ assert results != null;
+ assert results.size() == 1;
+ ResourceOperationSchedule returnedSchedule = results.get(0);
+ assert returnedSchedule.getId() > 0 : returnedSchedule;
+ assert returnedSchedule.getJobId() != null : returnedSchedule;
+ assert returnedSchedule.getJobName() != null : returnedSchedule;
+ assert returnedSchedule.getJobGroup() != null : returnedSchedule;
+ assert returnedSchedule.getDescription().equals("desc");
+ assert returnedSchedule.getOperationName().equals("testOp");
+ assert returnedSchedule.getParameters() != null;
+ assert returnedSchedule.getResource().getId() == resource.getId();
+
+ System.out.println("WAITING FOR 4s FOR THE SCHEDULED OPERATION TO FINISH");
+ Thread.sleep(4000L);
+
+ PageList<ResourceOperationHistory> resultsHist;
+ resultsHist = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert resultsHist != null;
+ assert resultsHist.size() == 1;
+ ResourceOperationHistory history = resultsHist.get(0);
+ assert history.getId() > 0 : history;
+ assert history.getJobId() != null : history;
+ assert history.getJobName() != null : history;
+ assert history.getJobGroup() != null : history;
+ assert history.getErrorMessage() == null : history;
+ assert history.getStatus() == OperationRequestStatus.SUCCESS : history;
+ assert history.getSubjectName().equals(overlord.getName()) : history;
+
+ PageList<ResourceOperationLastCompletedComposite> list;
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 1;
+ assert list.get(0).getOperationHistoryId() == history.getId();
+ assert list.get(0).getResourceId() == resource.getId();
+ assert list.get(0).getResourceName().equals(resource.getName());
+ assert list.get(0).getOperationName().equals("Test Operation");
+
+ operationManager.deleteOperationHistory(overlord, history.getId(), false);
+ resultsHist = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert resultsHist != null;
+ assert resultsHist.size() == 0;
+
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 0;
+ }
+
+ @Test(enabled = ENABLE_TESTS)
+ public void testCronGroupScheduling() throws Exception {
+ Resource resource = newResource;
+ ResourceGroup group = newGroup;
+ Calendar calendar = new GregorianCalendar();
+ calendar.add(Calendar.SECOND, 2);
+ GroupOperationSchedule schedule = operationManager.scheduleGroupOperationUsingCron(overlord, newGroup.getId(), new int[] { resource.getId() }, true, "testOp", null, calendar.get(Calendar.SECOND) + " " + calendar.get(Calendar.MINUTE)
+ + " * * * ?", 20, "desc");
+
+ assert schedule != null;
+ assert schedule.getDescription().equals("desc");
+ assert schedule.getOperationName().equals("testOp");
+ assert schedule.getParameters() != null;
+ assert schedule.getGroup().getId() == group.getId();
+
+ List<GroupOperationSchedule> results;
+ results = operationManager.findScheduledGroupOperations(overlord, group.getId());
+ assert results != null;
+ assert results.size() == 1;
+ GroupOperationSchedule returnedSchedule = results.get(0);
+ assert returnedSchedule.getId() > 0 : returnedSchedule;
+ assert returnedSchedule.getJobId() != null : returnedSchedule;
+ assert returnedSchedule.getJobName() != null : returnedSchedule;
+ assert returnedSchedule.getJobGroup() != null : returnedSchedule;
+ assert returnedSchedule.getDescription().equals("desc");
+ assert returnedSchedule.getOperationName().equals("testOp");
+ assert returnedSchedule.getParameters() != null;
+ assert returnedSchedule.getGroup().getId() == group.getId();
+
+ System.out.println("WAITING FOR 4s FOR THE SCHEDULED OPERATION TO FINISH");
+ Thread.sleep(4000L);
+
+ PageList<ResourceOperationHistory> resultsHist;
+ resultsHist = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert resultsHist != null;
+ assert resultsHist.size() == 1;
+ ResourceOperationHistory history = resultsHist.get(0);
+ assert history.getId() > 0 : history;
+ assert history.getJobId() != null : history;
+ assert history.getJobName() != null : history;
+ assert history.getJobGroup() != null : history;
+ assert history.getErrorMessage() == null : history;
+ assert history.getStatus() == OperationRequestStatus.SUCCESS : history;
+ assert history.getSubjectName().equals(overlord.getName()) : history;
+
+ PageList<ResourceOperationLastCompletedComposite> list;
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 1;
+ assert list.get(0).getOperationHistoryId() == history.getId();
+ assert list.get(0).getResourceId() == resource.getId();
+ assert list.get(0).getResourceName().equals(resource.getName());
+ assert list.get(0).getOperationName().equals("Test Operation");
+
+ operationManager.deleteOperationHistory(overlord, history.getId(), false);
+ resultsHist = operationManager.findCompletedResourceOperationHistories(overlord, resource.getId(), null, null,
+ PageControl.getUnlimitedInstance());
+ assert resultsHist != null;
+ assert resultsHist.size() == 0;
+
+ list = operationManager.findRecentlyCompletedResourceOperations(overlord, null,
+ PageControl.getUnlimitedInstance());
+ assert list.size() == 0;
+ }
private Resource createNewResource() throws Exception {
getTransactionManager().begin();
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java | 12 ++++------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit d3ee49b474616fdbd0b3829379520c6da1406ec0
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 26 09:56:10 2013 -0400
Bug 824010
Until it's clear we can wipe them, make sure the autoupdater migration
task does not wipe the native prefs.
diff --git a/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java
index 333d9aa..aec7a16 100644
--- a/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java
+++ b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java
@@ -42,16 +42,14 @@ public class MigrateAgentPreferences extends Task {
static private final String NODE_PREFIX = NODE_PARENT + NODE_DELIM;
static private final String DEFAULT_PREFS_FILE = "agent-prefs.properties";
static private final String MAINTAIN_NATIVE_PREFS_SYSPROP = "rhq.preferences.migrate.keep-native-prefs";
+ // Currently keeping native prefs until we're sure we don't need them.
+ // static private final String MAINTAIN_NATIVE_PREFS_DEFAULT = "false";
+ static private final String MAINTAIN_NATIVE_PREFS_DEFAULT = "true";
static private final Boolean MAINTAIN_NATIVE_PREFS;
static {
- Boolean sysProp = Boolean.FALSE;
- try {
- sysProp = Boolean.valueOf(System.getProperty(MAINTAIN_NATIVE_PREFS_SYSPROP, "false"));
- } catch (Throwable t) {
- sysProp = Boolean.FALSE;
- }
- MAINTAIN_NATIVE_PREFS = sysProp;
+ MAINTAIN_NATIVE_PREFS = Boolean.valueOf(System.getProperty(MAINTAIN_NATIVE_PREFS_SYSPROP,
+ MAINTAIN_NATIVE_PREFS_DEFAULT));
}
private File toDir;
11 years, 1 month
- 1
- 0
[rhq] modules/core modules/enterprise
by ips
modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java | 7 +++----
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 5 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java | 3 ++-
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit df18b71df2d5114d9edc8a26ad42e0d7a9036eb2
Author: Ian Springer <ispringer(a)apptegic.com>
Date: Tue Mar 26 09:48:20 2013 -0400
do not pass not-yet-fully-initialized "this" reference to GroupOperationHistory.addResourceOperationHistory() in ResourceOperationHistory's constructor, as the GWT compiler fails when it sees this (at least in my OS X 10.7.5, Oracle JDK 1.7.0_17 environment)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
index 08c29be..08611ac 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
@@ -126,12 +126,11 @@ public class ResourceOperationHistory extends OperationHistory {
protected ResourceOperationHistory() {
}
- public ResourceOperationHistory(String jobName, String jobGroup, String subjectName,
- OperationDefinition operationDefinition, Configuration parameters, Resource resource,
- GroupOperationHistory groupHistory) {
+ public ResourceOperationHistory(
+ String jobName, String jobGroup, String subjectName,
+ OperationDefinition operationDefinition, Configuration parameters, Resource resource) {
super(jobName, jobGroup, subjectName, operationDefinition, parameters);
this.resource = resource;
- setGroupOperationHistory(groupHistory);
}
public Resource getResource() {
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
index 34837a1..6ec38e5 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java
@@ -285,7 +285,8 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createGroupIndividualResourceHistory(GroupOperationHistory g1) {
ResourceOperationHistory r2 = new ResourceOperationHistory("job3" + System.currentTimeMillis(), "group3",
- "user", newOperation, null, newResource, g1);
+ "user", newOperation, null, newResource);
+ r2.setGroupOperationHistory(g1);
r2.setStartedTime();
em.persist(r2);
return r2;
@@ -300,7 +301,7 @@ public class OperationHistoryTest extends AbstractEJB3Test {
private ResourceOperationHistory createIndividualResourceHistory() {
ResourceOperationHistory r1 = new ResourceOperationHistory("job1" + System.currentTimeMillis(), "group1",
- "user", newOperation, null, newResource, null);
+ "user", newOperation, null, newResource);
r1.setStartedTime();
em.persist(r1);
return r1;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 4bc457e..5b3b374 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -149,7 +149,7 @@ public class ResourceOperationHistoryDataSource extends
@Override
protected ResourceOperationHistory createOperationHistory() {
- return new ResourceOperationHistory(null, null, null, null, null, null, null);
+ return new ResourceOperationHistory(null, null, null, null, null, null);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index df1e09e..dc5e887 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -431,7 +431,7 @@ public class OperationHistoryDataSource extends
ResourceOperationHistory resourceOperationHistory = new ResourceOperationHistory(null, null,
from.getAttribute(Field.SUBJECT),
(OperationDefinition) from.getAttributeAsObject(Field.OPERATION_DEFINITION),
- (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource, null);
+ (Configuration) from.getAttributeAsObject(Field.PARAMETERS), resource);
resourceOperationHistory.setId(from.getAttributeAsInt(Field.ID));
return resourceOperationHistory;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
index 955de7a..6982d58 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
@@ -97,7 +97,8 @@ public abstract class OperationJob implements Job {
ResourceOperationHistory history;
history = new ResourceOperationHistory(jobName, jobGroup, schedule.getSubject().getName(), op, parameters,
- schedule.getResource(), groupHistory);
+ schedule.getResource());
+ history.setGroupOperationHistory(groupHistory);
// persist the results of the initial create
ResourceOperationHistory persisted;
11 years, 1 month
- 1
- 0
[rhq] modules/plugins
by Remy Maucherat
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java | 1
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java | 1
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java | 1
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 14 +++
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 38 ++--------
5 files changed, 25 insertions(+), 30 deletions(-)
New commits:
commit 417fbb59817edf64a93d3cca00f2c51926379ab2
Author: Rémy Maucherat <rmaucher(a)redhat.com>
Date: Tue Mar 26 14:51:55 2013 +0100
Fix some roles operations.
Fix some attributes (not valid across all versions).
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java
index 1d667a7..ba68ce9 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java
@@ -185,6 +185,7 @@ public class TomcatGroupComponent extends MBeanResourceComponent<TomcatUserDatab
nameProperty = new PropertySimple(CONFIG_GROUP_NAME, name.substring(1, name.length() - 1));
opConfig.put(nameProperty);
resourceContext.getParentResourceComponent().invokeOperation("removeGroup", opConfig);
+ resourceContext.getParentResourceComponent().save();
}
}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java
index 92e2610..051965c 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java
@@ -50,6 +50,7 @@ public class TomcatRoleComponent extends MBeanResourceComponent<TomcatUserDataba
nameProperty = new PropertySimple(CONFIG_ROLE_NAME, name);
opConfig.put(nameProperty);
resourceContext.getParentResourceComponent().invokeOperation("removeRole", opConfig);
+ resourceContext.getParentResourceComponent().save();
}
@Override
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java
index 24936cd..7eb8aa5 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java
@@ -206,6 +206,7 @@ public class TomcatUserComponent extends MBeanResourceComponent<TomcatUserDataba
nameProperty = new PropertySimple(CONFIG_USERNAME, name.substring(1, name.length() - 1));
opConfig.put(nameProperty);
resourceContext.getParentResourceComponent().invokeOperation("removeUser", opConfig);
+ resourceContext.getParentResourceComponent().save();
}
}
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
index 23a20e1..ead4956 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
@@ -26,6 +26,7 @@ package org.jboss.on.plugins.tomcat;
import org.jboss.on.plugins.tomcat.helper.CreateResourceHelper;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.resource.CreateResourceStatus;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
@@ -45,8 +46,11 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe
String objectName = null;
String operation = null;
try {
+ PropertySimple newGroups = null;
+ PropertySimple newRoles = null;
if (TomcatGroupComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
name = report.getResourceConfiguration().getSimple("groupname").getStringValue();
+ newRoles = report.getResourceConfiguration().getSimple(TomcatGroupComponent.CONFIG_ROLES);
report.getResourceConfiguration().remove(TomcatGroupComponent.CONFIG_ROLES);
objectName = String.format("Users:type=Group,groupname=\"%s\",database=UserDatabase", name);
operation = "createGroup";
@@ -56,6 +60,8 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe
operation = "createRole";
} else if (TomcatUserComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
name = report.getResourceConfiguration().getSimple("username").getStringValue();
+ newRoles = report.getResourceConfiguration().getSimple(TomcatUserComponent.CONFIG_ROLES);
+ newGroups = report.getResourceConfiguration().getSimple(TomcatUserComponent.CONFIG_GROUPS);
report.getResourceConfiguration().remove(TomcatUserComponent.CONFIG_ROLES);
report.getResourceConfiguration().remove(TomcatUserComponent.CONFIG_GROUPS);
objectName = String.format("Users:type=User,username=\"%s\",database=UserDatabase", name);
@@ -70,6 +76,14 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe
CreateResourceHelper.setResourceName(report, name);
this.invokeOperation(operation, report.getResourceConfiguration());
+ if (TomcatGroupComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
+ report.getResourceConfiguration().put(newRoles);
+ // FIXME: Add newRoles to the group
+ } else if (TomcatUserComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
+ report.getResourceConfiguration().put(newGroups);
+ report.getResourceConfiguration().put(newRoles);
+ // FIXME: Add newRoles and newGroups to the user
+ }
// If all went well, persist the changes to the Tomcat user Database
save();
diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
index 37bc478..97f410a 100644
--- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
@@ -233,7 +233,9 @@
name="Tomcat Virtual Host"
discovery="TomcatVHostDiscoveryComponent"
class="TomcatVHostComponent"
- description="A virtual host in the web container">
+ description="A virtual host in the web container"
+ createDeletePolicy="both"
+ creationDataType="configuration">
<plugin-configuration>
<c:group
@@ -508,10 +510,6 @@
type="integer"
description="Maximum size of the static resource cache in kilobytes. If not specified, the default value is 10240 (10 megabytes)." />
<c:simple-property
- name="caseSensitive"
- type="boolean"
- description="If the value of this flag is true, all case sensitivity checks will be disabled. If not specified, the default value of the flag is true. NOTE: This flag MUST NOT be set to false on the Windows platform (or any other OS which does not have a case sensitive filesystem), as it will disable case sensitivity checks, allowing JSP source code disclosure, among other security problems." />
- <c:simple-property
name="cookies"
type="boolean"
description="Set to true if you want cookies to be used for session identifier communication if supported by the client (this is the default). Set to false if you want to disable the use of cookies for session identifier communication, and rely only on URL rewriting by the application." />
@@ -523,7 +521,8 @@
<c:simple-property
name="configFile"
type="string"
- description="The location of the context.xml resource or file" />
+ description="The location of the context.xml resource or file Note: Does not exist in Tomcat 7 (return type changed to URL)"
+ required="false" />
<c:simple-property
name="crossContext"
type="boolean"
@@ -533,13 +532,7 @@
readOnly="true"
required="true"
description="The docBase set for this application" />
- <!-- Although it claims to be writable, update failed in my V5 and V6 test, so read only for now. -->
- <c:simple-property
- name="eventProvider"
- type="boolean"
- description="Event provider support for this managed object?"
- readOnly="true" />
- <c:simple-property
+ <c:simple-property
name="privileged"
type="boolean"
description="Set to true to allow this context to use container servlets, like the manager servlet. Use of the privileged attribute will change the context's parent class loader to be the Server class loader rather than the Shared class loader. Note that in a default installation, the Common class loader is used for both the Server and the Shared class loaders." />
@@ -551,18 +544,6 @@
name="saveConfig"
type="boolean"
description="Write the configuration as needed on startup?" />
- <!-- Although it claims to be writable, update failed in my V5 and V6 test, so read only for now. -->
- <c:simple-property
- name="stateManageable"
- type="boolean"
- description="State management support for this managed object?"
- readOnly="true" />
- <!-- Although it claims to be writable, update failed in my V5 and V6 test, so read only for now. -->
- <c:simple-property
- name="statisticsProvider"
- type="boolean"
- description="Performance statistics support for this managed object?"
- readOnly="true" />
<c:simple-property
name="swallowOutput"
type="boolean"
@@ -864,10 +845,6 @@
type="boolean"
description="A boolean value which can be used to enable or disable the TRACE HTTP method. If not specified, this attribute is set to false." />
<c:simple-property
- name="bufferSize"
- type="integer"
- description="HTTP: The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided. AJP: The size of the output buffer to use. If less than or equal to zero, then output buffering is disabled. The default value is -1 (i.e. buffering disabled)" />
- <c:simple-property
name="connectionTimeout"
type="integer"
description="HTTP: The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented. The default value is 60000 (i.e. 60 seconds). AJP: The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented. The default value is infinite (i.e. no timeout)."
@@ -875,7 +852,8 @@
<c:simple-property
name="emptySessionPath"
type="boolean"
- description="If set to true, all paths for session cookies will be set to /. This can be useful for portlet specification implementations, but will greatly affect performance if many applications are accessed on a given server by the client. If not specified, this attribute is set to false." />
+ description="If set to true, all paths for session cookies will be set to /. This can be useful for portlet specification implementations, but will greatly affect performance if many applications are accessed on a given server by the client. If not specified, this attribute is set to false. Note: Does not exist in Tomcat 7"
+ required="false" />
<c:simple-property
name="enableLookups"
type="boolean"
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/agent/src/etc/rhq-agent.bat | 4 +++-
modules/enterprise/agent/src/etc/rhq-agent.sh | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 399bc2863d82d499158c00ccc7ae4e3b50cdfa04
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 26 09:05:15 2013 -0400
Bug 824010
Don't use custom FilePreferences by default at this time. Stick with
native prefs storage by default. We need to further evaluate upgrade
scenarios.
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat
index 5cf1814..f94603c 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -175,7 +175,9 @@ if not defined RHQ_AGENT_MAINCLASS (
set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
)
-set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %_JAVA_PREFERENCES_FACTORY_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+rem note - currently not using custom Java Prefs as the default, use commented command line to activate
+rem set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %_JAVA_PREFERENCES_FACTORY_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
if not defined _SETENV_ONLY (
rem log4j 1.2.8 does not create the directory for us (later versions do)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index 52db5cd..9e8de03 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -279,7 +279,9 @@ if [ -z "$RHQ_AGENT_MAINCLASS" ]; then
fi
# Build the command line that starts the VM
-CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JAVA_PREFERENCES_FACTORY_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
+# note - currently not using custom Java Prefs as the default, use commented command line to activate
+# CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JAVA_PREFERENCES_FACTORY_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
+CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
debug_msg "Executing the agent with this command line:"
debug_msg "$CMD"
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c696de2117ac5d377b7dc3165a71a7bd485fe8fe
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Mar 25 15:01:03 2013 -0400
Bug 824010
- remove extraneous parens
diff --git a/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
index c5c1ab0..132a7b8 100644
--- a/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
+++ b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
@@ -71,7 +71,7 @@ wrapper.java.additional.4=-Di18nlog.dump-stack-traces=false
wrapper.java.additional.5=-Dsigar.nativeLogging=false
wrapper.java.additional.6="-Djava.endorsed.dirs=%RHQ_AGENT_HOME%/lib/endorsed"
wrapper.java.additional.7="-Djava.util.prefs.PreferencesFactory=org.rhq.core.util.preferences.FilePreferencesFactory"
-wrapper.java.additional.8="-Drhq.preferences.file="%RHQ_AGENT_HOME%"/conf/agent-prefs.properties"
+wrapper.java.additional.8="-Drhq.preferences.file=%RHQ_AGENT_HOME%/conf/agent-prefs.properties"
# We want to make sure the agent starts in its install directory (quotes not needed)
wrapper.working.dir=%RHQ_AGENT_HOME%
11 years, 1 month
- 1
- 0
[rhq] 2 commits - etc/eclipse-tools modules/core modules/enterprise
by Jay Shaughnessy
etc/eclipse-tools/RHQ | 59 +---
modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java | 21 +
modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf | 2
modules/enterprise/agent/src/etc/rhq-agent-env.bat | 2
modules/enterprise/agent/src/etc/rhq-agent-env.sh | 2
modules/enterprise/agent/src/etc/rhq-agent.bat | 9
modules/enterprise/agent/src/etc/rhq-agent.sh | 9
modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java | 141 ++++++++++
modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build-tasks.properties | 5
modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml | 4
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc | 9
11 files changed, 209 insertions(+), 54 deletions(-)
New commits:
commit 4ed6e54a08c3897fa5fa5df55581ec6b2db95fea
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Mar 25 14:01:57 2013 -0400
remove duplicate itest debug profile
diff --git a/etc/eclipse-tools/RHQ Remote Debugging - Server.launch b/etc/eclipse-tools/RHQ Remote Debugging - Server.launch
index 6b68fc6..da6275c 100644
--- a/etc/eclipse-tools/RHQ Remote Debugging - Server.launch
+++ b/etc/eclipse-tools/RHQ Remote Debugging - Server.launch
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/rhq"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
-<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
-<mapEntry key="port" value="8787"/>
-<mapEntry key="hostname" value="localhost"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="rhq"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/rhq"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="hostname" value="localhost"/>
+<mapEntry key="port" value="8787"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="rhq"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
diff --git a/etc/eclipse-tools/RHQ Remote Debugging - itest.launch b/etc/eclipse-tools/RHQ Remote Debugging - itest.launch
deleted file mode 100644
index 1ea5d31..0000000
--- a/etc/eclipse-tools/RHQ Remote Debugging - itest.launch
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/rhq"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;rhq&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.ec
lipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.
0.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento=
"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVari
able path=&quot;M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant-nodeps/1.8.0/ant-nodeps-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"
/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;class
pathVariable path=&quot;M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/testng/testng/6.1.1/testng-6.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContai
ner.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/snmp4j/snmp4j/1.8.2/snmp4j-1.8.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&
#10;&lt;classpathVariable path=&quot;M2_REPO/tomcat/tomcat-jk/4.1.31/tomcat-jk-4.1.31.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jdom/jdom/1.0/jdom-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sour
ceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-jmx/4.2.3.GA/jboss-jmx-4.2.3.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&
;quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/tomcat/catalina/5.5.20/catalina-5.5.20.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar&quot;/&gt;&#13;&#1
0;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&
quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/struts-menu/struts-menu/2.3/struts-menu-2.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/velocity/velocity/1.5/velocity-1.5.jar&quot;/&gt;&am
p;#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&qu
ot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/jboss-ejb3-all/1.0.0.Alpha9/jboss-ejb3-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jbpm/3.1.1/j
bpm-3.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-embeddable-ejb3/hibernate-all/1.0.0.Alpha9/hibernate-all-1.0.0.Alpha9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
3; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&
lt;classpathVariable path=&quot;M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/faces/jsf-api/1.2_14/jsf-api-1.2_14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launch
ing.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?
&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/mc4j/org-mc4j-ems/1.2.16/org-mc4j-ems-1.2.16.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar&quot;/&gt;&#13;&#10;&q
uot; typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javax/mail/mail/1.4.2/mail-1.4.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encodi
ng=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&
amp;quot;M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.laun
ching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; s
tandalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/jbossws-spi/1.1.1.GA/jbossws-spi-1.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/jbossws/jbossws-native-core/3
.1.1.GA/jbossws-native-core-3.1.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariabl
e"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/swizzle/swizzle-confluence/1.6.1/swizzle-confluence-1.6.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jvnet/inflector/0.7.0/inflector-0.7.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot
;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/augeas/augeas/0.0.2/augeas-0.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/json/json/20080701/json-20080701.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/java/dev/jna/jna/3.2.5/jna-3.2.5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.s
ourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/freemarker/freemarker/2.3.11/freemarker-2.3.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/seam/jboss-seam/2.1.0.SP1/jboss-seam-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standa
lone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/seam/jboss-seam-ui/2.1.0.SP1/jboss-seam-ui-2.1.0.SP1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar&quot;/&
gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/net/sf/opencsv/opencsv/1.8/opencsv-1.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&
quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bouncycastle/bcpg-jdk15/140/bcpg-jdk15-140.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1
.2/xmlrpc-client-3.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/xmlrpc/xmlrpc-common/3.1.2/xmlrpc-common-3.1.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable&quo
t;/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&am
p;gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/pircbot/pircbot/1.4.2/pircbot-1.4.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/twitter4j/twitter4j-core/2.2.4/twitter4j-core-2.2.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.l
aunching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;
standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar&quot;/&gt;&#13;&am
p;#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quo
t; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/gwt/gwt-user/2.4.0/gwt-user-2.4.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/gwt/gwt-dev/2.4.0/gwt-dev-2.4.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/smartgwt/smartgwt/3.0/smartgwt-3.0.j
ar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/code/gwt-log/gwt-log/3.1.0/gwt-log-3.1.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/ca/nanometrics/gflot/1.0.0/gflot-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml vers
ion=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/jcraft/jsch/0.1.29/jsch-0.1.29.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/dbunit/dbun
it/2.4.8/dbunit-2.4.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/apache/poi/poi/3.7/poi-3.7.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot
;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-core/3.1/unitils-core-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-
orm/3.1/unitils-orm-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/>
; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&qu
ot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/com/google/code/morphia/morphia/1.00-SNAPSHOT/morphia-1.00-SNAPSHOT.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-links/2.3.3.Final/resteasy-links-2.3.
3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.3.3.Final/resteasy-jaxrs-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/resteasy-jackson-provider/2.3.3.Final/resteasy-jackson-provider-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContain
er.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/resteasy/jaxrs-api/2.3.3.Final/jaxrs-api-2.3.3.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; st
andalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;JDK_HOME/lib/tools.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar&quot;/&gt;&#13;&#
10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-core/1.4.11/powermock-core-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml v
ersion=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&
amp;#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-impl-base/1.0.0/shrinkwrap-impl-base-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-api/1.0.0/shrinkwrap-api-1.0.0.jar&quot;/&
amp;gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.0/shrinkwrap-spi-1.0.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-api-base/2.0.0-alpha-2/shrinkwrap-descriptors-api-base-2.0.0-alpha-2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.
classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api/1.0.0-beta-6/shrinkwrap-resolver-api-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-api-maven/1.0.0-beta-6/shrinkwrap-resolver-api-maven-1.0.0-beta-6.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container mem
ento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-spi/1.0.0.Final/arquillian-test-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/test/arquillian-test-api/1.0.0.Final/arquillian-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; stan
dalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-spi/1.0.0.Final/arquillian-core-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/core/arquillian-core-api/1.0.0.Final/arquillian-core-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quo
t;M2_REPO/org/jboss/arquillian/container/arquillian-container-spi/1.0.0.Final/arquillian-container-spi-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/container/arquillian-container-test-api/1.0.0.Final/arquillian-container-test-api-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathVariable path=&quot;M2_REPO/org/jboss/arquillian/testng/arquillian-testng
-core/1.0.0.Final/arquillian-testng-core-1.0.0.Final.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathVariable"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
-<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
-<mapEntry key="hostname" value="localhost"/>
-<mapEntry key="port" value="8798"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="rhq"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
-</launchConfiguration>
commit baef5c9d8ed4ca872ccb4f3240bbb603f00abd5c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Mar 25 14:01:25 2013 -0400
Bug 824010
Have agent store configuration on filesystem instead of Java preferences
The RHQ Agent now uses our custom FilePreferences Java Prefs impl to
store the ageng configuration. By default the prefs file is stored in
RHQ_AGENT_HOME/agent-prefs.properties, but the file placement is
configurable. The value is set in the RHQ_AGENT_JAVA_OPTS
as part of rhq-agent-env.sh|bat.
New agents will start using the new prefs approach immediately. For
existing agents the auto-update procedure will perform the one-time
migration from the native prefs store to the file prefs. By default
the native prefs will be removed as part of the migration, to leave
the native prefs clean of RHQ debris.
Also:
- make sure streams get closed in FilePreferences impl
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java b/modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java
index f542329..e03ef1b 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java
@@ -114,7 +114,15 @@ public class FilePreferences extends AbstractPreferences {
synchronized (file) {
Properties p = new Properties();
try {
- p.load(new FileInputStream(file));
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(file);
+ p.load(fis);
+ } finally {
+ if (null != fis) {
+ fis.close();
+ }
+ }
StringBuilder sb = new StringBuilder();
getPath(sb);
@@ -194,7 +202,16 @@ public class FilePreferences extends AbstractPreferences {
}
}
- p.store(new FileOutputStream(file), "FilePreferences");
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(file);
+ p.store(fos, "RHQ FilePreferences. Do not edit this file manually.");
+ } finally {
+ if (null != fos) {
+ fos.close();
+ }
+ }
+
} catch (IOException e) {
throw new BackingStoreException(e);
}
diff --git a/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
index 25c99aa..c5c1ab0 100644
--- a/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
+++ b/modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf
@@ -70,6 +70,8 @@ wrapper.java.additional.3=-Xmx128m
wrapper.java.additional.4=-Di18nlog.dump-stack-traces=false
wrapper.java.additional.5=-Dsigar.nativeLogging=false
wrapper.java.additional.6="-Djava.endorsed.dirs=%RHQ_AGENT_HOME%/lib/endorsed"
+wrapper.java.additional.7="-Djava.util.prefs.PreferencesFactory=org.rhq.core.util.preferences.FilePreferencesFactory"
+wrapper.java.additional.8="-Drhq.preferences.file="%RHQ_AGENT_HOME%"/conf/agent-prefs.properties"
# We want to make sure the agent starts in its install directory (quotes not needed)
wrapper.working.dir=%RHQ_AGENT_HOME%
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.bat b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
index dd82cbe..be6b6df 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat
@@ -61,7 +61,7 @@ rem rhq-agent-wrapper.bat. The Java VM command line
rem options used by rhq-agent-wrapper.bat are set in
rem wrapper\rhq-agent-wrapper.conf.
rem
-rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
+rem set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -Drhq.preferences.file=%RHQ_AGENT_HOME%\conf\agent-prefs.properties
rem RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
rem endorsed dirs for the agent's VM. If this
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.sh b/modules/enterprise/agent/src/etc/rhq-agent-env.sh
index 4fa4311..512cec6 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent-env.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent-env.sh
@@ -51,7 +51,7 @@
# to the agent's defaults, then you will want to
# use RHQ_AGENT_ADDITIONAL_JAVA_OPTS instead.
#
-#RHQ_AGENT_JAVA_OPTS="-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true"
+#RHQ_AGENT_JAVA_OPTS="-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -Drhq.preferences.file=${RHQ_AGENT_HOME}/conf/agent-prefs.properties"
# RHQ_AGENT_JAVA_ENDORSED_DIRS - Java VM command line option to set the
# endorsed dirs for the agent's VM. If this
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat
index 005e535..5cf1814 100644
--- a/modules/enterprise/agent/src/etc/rhq-agent.bat
+++ b/modules/enterprise/agent/src/etc/rhq-agent.bat
@@ -116,10 +116,15 @@ rem Prepare the VM command line options to be passed in
rem ----------------------------------------------------------------------
if not defined RHQ_AGENT_JAVA_OPTS (
- set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true
+ set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -Drhq.preferences.file="%RHQ_AGENT_HOME%\conf\agent-prefs.properties"
)
if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS%
+rem ----------------------------------------------------------------------
+rem Ensure the agent uses our custom JavaPreferences implementation
+rem ----------------------------------------------------------------------
+set _JAVA_PREFERENCES_FACTORY_OPT="-Djava.util.prefs.PreferencesFactory=org.rhq.core.util.preferences.FilePreferencesFactory"
+
if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" (
if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs
goto :skip_java_endorsed_dirs
@@ -170,7 +175,7 @@ if not defined RHQ_AGENT_MAINCLASS (
set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain
)
-set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
+set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %_JAVA_PREFERENCES_FACTORY_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS%
if not defined _SETENV_ONLY (
rem log4j 1.2.8 does not create the directory for us (later versions do)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index b3ee8a7..52db5cd 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -167,7 +167,7 @@ done
# ----------------------------------------------------------------------
if [ -z "$RHQ_AGENT_JAVA_OPTS" ]; then
- RHQ_AGENT_JAVA_OPTS="-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true"
+ RHQ_AGENT_JAVA_OPTS="-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -Drhq.preferences.file=${RHQ_AGENT_HOME}/conf/agent-prefs.properties"
fi
debug_msg "RHQ_AGENT_JAVA_OPTS: $RHQ_AGENT_JAVA_OPTS"
@@ -204,6 +204,11 @@ fi
debug_msg "RHQ_AGENT_ADDITIONAL_JAVA_OPTS: $RHQ_AGENT_ADDITIONAL_JAVA_OPTS"
# ----------------------------------------------------------------------
+# Ensure the agent uses our custom JavaPreferences implementation
+# ----------------------------------------------------------------------
+_JAVA_PREFERENCES_FACTORY_OPT="\"-Djava.util.prefs.PreferencesFactory=org.rhq.core.util.preferences.FilePreferencesFactory\""
+
+# ----------------------------------------------------------------------
# Prepare the command line arguments passed to the RHQ Agent
# ----------------------------------------------------------------------
if [ -z "$RHQ_AGENT_CMDLINE_OPTS" ]; then
@@ -274,7 +279,7 @@ if [ -z "$RHQ_AGENT_MAINCLASS" ]; then
fi
# Build the command line that starts the VM
-CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
+CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JAVA_PREFERENCES_FACTORY_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
debug_msg "Executing the agent with this command line:"
debug_msg "$CMD"
diff --git a/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java
new file mode 100644
index 0000000..333d9aa
--- /dev/null
+++ b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java
@@ -0,0 +1,141 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.agent.update;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Properties;
+import java.util.prefs.Preferences;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * This migrates agent preferences stored by the native preferences implementation to a file compatible with
+ * our custom FilePreferences implementation. It works as follows:
+ *
+ * @author Jay Shaughnessy
+ * @author John Mazzitelli
+ */
+public class MigrateAgentPreferences extends Task {
+ /**
+ * This is the top level parent node of all agent preferences and is directly under the userRoot preferences node.
+ */
+ static private final String NODE_PARENT = "rhq-agent";
+ static private final String NODE_DELIM = "/";
+ static private final String NODE_PREFIX = NODE_PARENT + NODE_DELIM;
+ static private final String DEFAULT_PREFS_FILE = "agent-prefs.properties";
+ static private final String MAINTAIN_NATIVE_PREFS_SYSPROP = "rhq.preferences.migrate.keep-native-prefs";
+ static private final Boolean MAINTAIN_NATIVE_PREFS;
+
+ static {
+ Boolean sysProp = Boolean.FALSE;
+ try {
+ sysProp = Boolean.valueOf(System.getProperty(MAINTAIN_NATIVE_PREFS_SYSPROP, "false"));
+ } catch (Throwable t) {
+ sysProp = Boolean.FALSE;
+ }
+ MAINTAIN_NATIVE_PREFS = sysProp;
+ }
+
+ private File toDir;
+ private Boolean failonerror = Boolean.FALSE;
+
+ public void setToDir(File toDir) {
+ this.toDir = toDir;
+ }
+
+ public void setFailonerror(Boolean flag) {
+ this.failonerror = flag;
+ }
+
+ /**
+ * @see org.apache.tools.ant.Task#execute()
+ */
+ @Override
+ public void execute() throws BuildException {
+ validateAttributes();
+
+ try {
+ // if the prefs file already exists we can assume migration already happened or is unnecessary
+ String filePath = System.getProperty("rhq.preferences.file");
+ File toFile = (null != filePath) ? new File(filePath) : new File(toDir, DEFAULT_PREFS_FILE);
+ if (toFile.exists()) {
+ return;
+ }
+
+ Preferences userRoot = Preferences.userRoot();
+
+ // if there are no rhq-agent prefs stored then there is nothing to migrate
+ if (!userRoot.nodeExists(NODE_PARENT)) {
+ return;
+ }
+
+ Properties configProps = new Properties();
+ Preferences topNode = userRoot.node(NODE_PARENT);
+
+ // each --pref, including the default preferences are just one level down from the parent
+ for (String pref : topNode.childrenNames()) {
+ Preferences prefNode = topNode.node(pref);
+
+ for (String key : prefNode.keys()) {
+ String configPropKey = NODE_PREFIX + prefNode.name() + NODE_DELIM + key;
+ String configPropVal = prefNode.get(key, "");
+ configProps.setProperty(configPropKey, configPropVal);
+ }
+
+ }
+
+ // write out the new prefs file with the migrated properties
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(toFile);
+ configProps.store(fos, "Created by RHQ MigrateAgentPreferences tool.");
+ } finally {
+ if (null != fos) {
+ fos.close();
+ }
+ }
+
+ // wipe the old prefs to leave a clean system. In general there will only be one --pref child node,
+ // typically "default". Which means only one agent is actually configured under the "rhq-agent" top node.
+ // So, cleaning up and removing the top node should be preferable as it removes litter in the native prefs.
+ // If for some unlikely reason multiple agents are configured (using multiple --pref settings) then the user
+ // can avoid this cleanup by setting the proper system prop.
+ if (!MAINTAIN_NATIVE_PREFS) {
+ topNode.removeNode();
+ }
+
+ } catch (Throwable e) {
+ if (failonerror.booleanValue()) {
+ throw new BuildException(e);
+ } else {
+ log("Failed, but will not exit of failure: " + e);
+ }
+ }
+
+ return;
+ }
+
+ private void validateAttributes() throws BuildException {
+ if (null == toDir || !toDir.exists()) {
+ throw new BuildException("Must specify existing 'todir' directory");
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build-tasks.properties b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build-tasks.properties
index 77c41a9..bf58b2f 100644
--- a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build-tasks.properties
+++ b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build-tasks.properties
@@ -1,2 +1,3 @@
-# custom ANT tasks used by the update script
-copy-with-backup=org.rhq.enterprise.agent.update.CopyWithBackup
\ No newline at end of file
+# custom ANT tasks used by the update script
+copy-with-backup = org.rhq.enterprise.agent.update.CopyWithBackup
+migrate-agent-preferences = org.rhq.enterprise.agent.update.MigrateAgentPreferences
diff --git a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
index 376555e..6601de3 100644
--- a/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
+++ b/modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
@@ -128,9 +128,13 @@
<fileset dir="${rhq.agent.update.update-agent-dir}/conf">
<include name="*keystore*"/>
<include name="*truststore*"/>
+ <include name="*prefs*"/>
</fileset>
</copy>
+ <!-- if necessary, migrate native prefs into our file prefs (since RHQ 4.7) -->
+ <migrate-agent-preferences todir="${_update.tmp.dir}/rhq-agent/conf" />
+
<!-- if there are any Windows wrapper environment or include files, copy them -->
<echo>Copy existing Java Service Wrapper configuration files from the old agent to the new agent</echo>
<copy todir="${_update.tmp.dir}/rhq-agent/bin/wrapper">
diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
index 86f0c71..b76cd2f 100644
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
+++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
@@ -1,14 +1,15 @@
#
-# Additional dev-only options for the RHQ Server Java Service Wrapper
+# Additional dev-only options for the RHQ Server Java Service Wrapper. Numbering should at N+1 where N is the
+# last wrapper.java.additional.N entry in rhq-agent-wrapper.conf.
#
# enable remote debugging
-wrapper.java.additional.21=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
+wrapper.java.additional.9=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
# enable jprofiler
#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.22=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.23=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
+#wrapper.java.additional.10=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.11=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
# disable JVM startup timeout
wrapper.startup.timeout=0
11 years, 1 month
- 1
- 0