[rhq] 2 commits - modules/enterprise
by Jiri Kremser
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/TopologyManagerBeanTest.java | 112 +++++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java | 1
2 files changed, 90 insertions(+), 23 deletions(-)
New commits:
commit 592dfd81a99ec6d2b1486f2a99aa1ff95e771e5b
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Mar 27 14:10:12 2013 +0100
Enabling two tests that test the edge cases for criteria queries. Tesing possible regression of BZ 923458. Also added 8 more combinations of page size, start page and count of filtered elements.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/TopologyManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/TopologyManagerBeanTest.java
index 3cadf38..cd2523e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/TopologyManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/TopologyManagerBeanTest.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import org.testng.annotations.Test;
@@ -319,29 +320,87 @@ public class TopologyManagerBeanTest extends AbstractEJB3Test {
}
});
}
-
-
+
@Test(groups = "integration.ejb3")
public void testParsingAllCriteriaQueryResults1() throws Exception {
- testParsingHelperStartingPageEqualTo(0);
+ int startPage = 0;
+ int pageSize = 3;
+ int serverCount = 605;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
}
-
- /**
- * This test should pass if enabled, but doesn't :(
- */
- @Test(groups = "integration.ejb3", enabled = false)
+
+ @Test(groups = "integration.ejb3", enabled = true)
public void testParsingAllCriteriaQueryResults2() throws Exception {
- testParsingHelperStartingPageEqualTo(1);
+ int startPage = 1;
+ int pageSize = 3;
+ int serverCount = 605;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
}
-
- /**
- * This test should pass if enabled, but doesn't :(
- */
- @Test(groups = "integration.ejb3", enabled = false)
+
+ @Test(groups = "integration.ejb3", enabled = true)
public void testParsingAllCriteriaQueryResults3() throws Exception {
- testParsingHelperStartingPageEqualTo(5);
+ int startPage = 2;
+ int pageSize = 3;
+ int serverCount = 609;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
}
-
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults4() throws Exception {
+ int startPage = 3;
+ int pageSize = 7;
+ int serverCount = 800;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults5() throws Exception {
+ int startPage = 4;
+ int pageSize = 2;
+ int serverCount = 444;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults6() throws Exception {
+ int startPage = 5;
+ int pageSize = 3;
+ int serverCount = 605;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults7() throws Exception {
+ int startPage = 1;
+ int pageSize = 5;
+ int serverCount = 934;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults8() throws Exception {
+ int startPage = 4;
+ int pageSize = 7;
+ int serverCount = 1234;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults9() throws Exception {
+ int startPage = 2;
+ int pageSize = 1;
+ int serverCount = 109;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = true)
+ public void testParsingAllCriteriaQueryResults10() throws Exception {
+ int startPage = 0;
+ int pageSize = 11;
+ int serverCount = 999;
+ testParsingHelperStartingPageEqualTo(startPage, pageSize, serverCount);
+ }
+
@Test(groups = "integration.ejb3")
public void testFindNonExistentServer() throws Exception {
@@ -390,19 +449,17 @@ public class TopologyManagerBeanTest extends AbstractEJB3Test {
}
- private void testParsingHelperStartingPageEqualTo(final int startPage) throws Exception {
+ private void testParsingHelperStartingPageEqualTo(final int startPage, final int pageSize, final int serverCount) throws Exception {
- final int serverCount = 605;
- final int pageSize = 3;
executeInTransaction(new TransactionCallback() {
public void execute() throws Exception {
// verify that all server objects are actually parsed.
- final Set<String> serverNames = new HashSet<String>(serverCount);
+ final Set<String> serverNames = new TreeSet<String>();
final String namePrefix = "server";
final String addressPrefix = "address";
int shouldBeFoundCount = 0;
int shouldBeSkipped = pageSize * startPage;
-
+
for (int i = 0; i < serverCount; i++) {
String name = namePrefix + String.format(" %03d", i + 1);
Server server = new Server();
@@ -413,7 +470,7 @@ public class TopologyManagerBeanTest extends AbstractEJB3Test {
break;
case 1:
server.setOperationMode(OperationMode.MAINTENANCE);
- if (i % 20 == 9 && shouldBeSkipped-- <= 0) {
+ if (i % 20 == 9) {
shouldBeFoundCount++;
serverNames.add(name);
}
@@ -427,6 +484,15 @@ public class TopologyManagerBeanTest extends AbstractEJB3Test {
em.flush();
}
em.flush();
+
+ if (shouldBeSkipped > 0) {
+ // delete the members to be skipped because of the start page
+ String[] serverNamesArray = serverNames.toArray(new String[serverNames.size()]);
+ for (int i = 0; i < shouldBeSkipped; i++) {
+ serverNames.remove(serverNamesArray[serverNamesArray.length - i - 1]);
+ }
+ shouldBeFoundCount -= shouldBeSkipped;
+ }
// query the results and delete the servers
ServerCriteria criteria = new ServerCriteria();
@@ -466,7 +532,7 @@ public class TopologyManagerBeanTest extends AbstractEJB3Test {
serverNames.remove(s.getName());
}
- final int finderCallCounter = (int) Math.ceil((double) shouldBeFoundCount / pageSize) - startPage;
+ final int finderCallCounter = (int) Math.ceil((double) shouldBeFoundCount / pageSize);
assertTrue("While iterating the servers, the findServersByCriteria() should be called "
+ finderCallCounter + " times. It was called " + pagesFlipped.get(0) + " times.",
pagesFlipped.get(0) == finderCallCounter);
commit 902ce81c0fa6e6f0b66091c77977c68a05c3248d
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Mar 27 14:06:42 2013 +0100
[BZ 923458] - CriteriaQuery based finder fails if the start page is not zero and the totalSize is dividable by pageSize - Changing the initial value of variable count. It takes into consideration the possible offset made by using the non-zero start page set in the criteria.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java
index ab6a915..2d40388 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java
@@ -110,6 +110,7 @@ public class CriteriaQuery<T, C extends BaseCriteria> implements Iterable<T> {
public QueryResultsIterator(PageList<T> firstPage) {
currentPage = firstPage;
iterator = currentPage.iterator();
+ count = firstPage == null || firstPage.getPageControl() == null ? 0 : firstPage.getPageControl().getStartRow();
}
@Override
11 years, 1 month
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/common
by John Sanda
modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java | 395 ---------
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 396 ++++++++++
modules/common/cassandra-installer/src/main/resources/module/main/module.xml | 2
3 files changed, 397 insertions(+), 396 deletions(-)
New commits:
commit 37cea81ae7ecd7c89db8a9a34d05274661ce8da4
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Mar 26 22:21:25 2013 -0400
changing default settings and renaming installer to StorageInstaller
Changing default values for ports to avoid conflicts with an existing C*
install. Also changing default directory where C* stores data to be
/var/lib/rhq/storage.
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java
deleted file mode 100644
index 7c75fb5..0000000
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- *
- * * RHQ Management Platform
- * * Copyright (C) 2005-2012 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, version 2, as
- * * published by the Free Software Foundation, and/or the GNU Lesser
- * * General Public License, version 2.1, also as published by the Free
- * * Software Foundation.
- * *
- * * 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 and the GNU Lesser General Public License
- * * for more details.
- * *
- * * You should have received a copy of the GNU General Public License
- * * and the GNU Lesser General Public License along with this program;
- * * if not, write to the Free Software Foundation, Inc.,
- * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-package org.rhq.cassandra.installer;
-
-import static java.util.Arrays.asList;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.cassandra.DeploymentOptions;
-import org.rhq.cassandra.UnmanagedDeployer;
-import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
-import org.rhq.core.system.OperatingSystemType;
-import org.rhq.core.system.ProcessExecution;
-import org.rhq.core.system.ProcessExecutionResults;
-import org.rhq.core.system.SystemInfo;
-import org.rhq.core.system.SystemInfoFactory;
-import org.rhq.core.util.PropertiesFileUpdate;
-import org.rhq.core.util.StringUtil;
-import org.rhq.core.util.exception.ThrowableUtil;
-
-/**
- * @author John Sanda
- */
-public class CassandraInstaller {
-
- static {
- SystemInfoFactory.disableNativeSystemInfo();
- }
-
- private final Log log = LogFactory.getLog(CassandraInstaller.class);
-
- private Options options;
-
- private File rhqBaseDir;
-
- private File defaultDir;
-
- private int jmxPort = 7200;
-
- private int rpcPort = 9160;
-
- private int nativeTransportPort = 9042;
-
- private int storagePort = 7000;
-
- private int sslStoragePort = 7001;
-
- private boolean startNode = true;
-
- private boolean checkStatus = true;
-
- private File logDir;
-
- private String commitLogDir = "/var/lib/cassandra/commitlog";
-
- private String dataDir = "/var/lib/cassandra/data";
-
- private String savedCachesDir = "/var/lib/cassandra/saved_caches";
-
- public CassandraInstaller() {
- String basedir = System.getProperty("rhq.server.basedir");
- rhqBaseDir = new File(basedir);
- defaultDir = new File(basedir, "storage");
- logDir = new File(rhqBaseDir, "logs");
-
- Option hostname = new Option("n", "hostname", true, "The hostname or IP address on which the node will listen for " +
- "requests. If not specified, defaults to the value returned by InetAddress.getLocalHost().getHostName().");
- hostname.setArgName("HOSTNAME");
-
- Option seeds = new Option("s", "seeds", true, "A comma-delimited list of hostnames or IP addresses that " +
- "serve as contact points. Nodes use this list to find each other and to learn the cluster topology. " +
- "It does not need to specify all nodes in the cluster. Defaults to this node's hostname.");
- seeds.setArgName("SEEDS");
-
- Option jmxPortOption = new Option("j", "jmx-port", true, "The port on which to listen for JMX connections. " +
- "Defaults to " + jmxPort + ".");
- jmxPortOption.setArgName("PORT");
-
- Option nativeTransportPortOption = new Option("t", "native-transport-port", true, "The port on which to " +
- "listen for client requests. Defaults to " + nativeTransportPort);
- nativeTransportPortOption.setArgName("PORT");
-
- Option storagePortOption = new Option(null, "storage-port", true, "The port on which to listen for requests " +
- " from other nodes. Defaults to " + storagePort);
- storagePortOption.setArgName("PORT");
-
- Option sslStoragePortOption = new Option(null, "ssl-storage-port", true, "The port on which to listen for " +
- "encrypted requests from other nodes. Only used when encryption is enabled. Defaults to " + sslStoragePort);
- sslStoragePortOption.setArgName("PORT");
-
- Option startOption = new Option(null, "start", true, "Start the storage node after installing it on disk. " +
- "Defaults to true.");
- startOption.setArgName("true|false");
-
- Option checkStatus = new Option(null, "check-status", true, "Check the node status to verify that it is up " +
- "after starting it. This option is ignored if the start option is not set. Defaults to true.");
- checkStatus.setArgName("true|false");
-
- Option commitLogOption = new Option(null, "commitlog", true, "The directory where the storage node keeps " +
- "commit log files. Defaults to " + commitLogDir + ".");
- commitLogOption.setArgName("DIR");
-
- Option dataDirOption = new Option(null, "data", true, "The directory where the storage node keeps data files. " +
- "Defaults to " + dataDir + ".");
- dataDirOption.setArgName("DIR");
-
- Option savedCachesDirOption = new Option(null, "saved-caches", true, "The directory where the storage node " +
- "keeps saved cache files. Defaults to " + savedCachesDir + ".");
- savedCachesDirOption.setArgName("DIR");
-
- options = new Options()
- .addOption(new Option("h", "help", false, "Show this message."))
- .addOption(hostname)
- //.addOption(seeds)
- .addOption(jmxPortOption)
- .addOption(startOption)
- .addOption(checkStatus)
- .addOption(commitLogOption)
- .addOption(dataDirOption)
- .addOption(savedCachesDirOption)
- .addOption(nativeTransportPortOption)
- .addOption(storagePortOption)
- .addOption(sslStoragePortOption);
- }
-
- public void run(CommandLine cmdLine) throws Exception {
- if (cmdLine.hasOption("h")) {
- printUsage();
- } else {
- DeploymentOptions deploymentOptions = new DeploymentOptions();
-
- File basedir;
- if (cmdLine.hasOption("d")) {
- basedir = new File(cmdLine.getOptionValue("d"));
- } else {
- basedir = defaultDir;
- }
- deploymentOptions.setBasedir(basedir.getAbsolutePath());
-
- String hostname;
- if (cmdLine.hasOption("n")) {
- hostname = cmdLine.getOptionValue("n");
- } else {
- hostname = InetAddress.getLocalHost().getHostName();
- }
- deploymentOptions.setListenAddress(hostname);
- deploymentOptions.setRpcAddress(hostname);
-
- // TODO add support for getting updated seeds list
- // Rather than have the user specify the seeds for each node, the installer can
- // obtain the list either from the RHQ server or directly from querying the
- // database.
- String seeds = hostname;
- deploymentOptions.setSeeds(seeds);
-
- commitLogDir = cmdLine.getOptionValue("commitlog", commitLogDir);
- dataDir = cmdLine.getOptionValue("data", dataDir);
- savedCachesDir = cmdLine.getOptionValue("saved-caches", savedCachesDir);
-
- deploymentOptions.setCommitLogDir(cmdLine.getOptionValue(commitLogDir));
- deploymentOptions.setDataDir(dataDir);
- deploymentOptions.setSavedCachesDir(savedCachesDir);
- deploymentOptions.setLogDir(logDir.getAbsolutePath());
- deploymentOptions.setLoggingLevel("INFO");
- deploymentOptions.setRpcPort(rpcPort);
- deploymentOptions.setJmxPort(getPort(cmdLine, "jmx-port", jmxPort));
- deploymentOptions.setNativeTransportPort(getPort(cmdLine, "native-transport-port", nativeTransportPort));
- deploymentOptions.setStoragePort(getPort(cmdLine, "storage-port", storagePort));
- deploymentOptions.setSslStoragePort(getPort(cmdLine, "ssl-storage-port", sslStoragePort));
- deploymentOptions.load();
-
- checkPerms(options.getOption("saved-caches"), savedCachesDir);
- checkPerms(options.getOption("commitlog"), commitLogDir);
- checkPerms(options.getOption("data"), dataDir);
-
- UnmanagedDeployer deployer = new UnmanagedDeployer();
- deployer.unpackBundle();
- deployer.deploy(deploymentOptions, 1);
- log.info("Finished installing RHQ Storage Node. Performing post-install clean up...");
- deployer.cleanUpBundle();
-
- log.info("Updating rhq-server.properties...");
- PropertiesFileUpdate serverPropertiesUpdater = getServerProperties();
- try {
- serverPropertiesUpdater.update("rhq.cassandra.seeds", getSeedsProperty(seeds));
- } catch (IOException e) {
- throw new RuntimeException("An error occurred while trying to update RHQ server properties", e);
- }
-
- if (cmdLine.hasOption("start")) {
- startNode = Boolean.parseBoolean(cmdLine.getOptionValue("s"));
- }
- if (startNode) {
- log.info("Starting RHQ Storage Node");
- startNode(deploymentOptions);
-
- if (cmdLine.hasOption("check-status")) {
- checkStatus = Boolean.parseBoolean(cmdLine.getOptionValue("c"));
- }
- if (checkStatus) {
- if (verifyNodeIsUp(jmxPort, 5, 3000)) {
- log.info("RHQ Storage Node is up and running");
- } else {
- log.warn("Could not verify that the node is up and running.");
- }
- }
- }
- log.info("Installation of the storage node is complete.");
- }
- }
-
- private int getPort(CommandLine cmdLine, String option, int defaultValue) {
- return Integer.parseInt(cmdLine.getOptionValue(option, Integer.toString(defaultValue)));
- }
-
- private void checkPerms(Option option, String path) {
- File dir = new File(path);
-
- if (dir.exists()) {
- if (dir.isFile()) {
- log.warn(path + " is not a directory. Use the --" + option.getLongOpt() + " to change this value.");
- }
- } else {
- File parent = findParentDir(new File(path));
- if (!parent.canWrite()) {
- log.warn("The user running this installer does not appear to have write permissions to " + parent +
- ". Either make sure that the user running the storage node has write permissions or use the --" +
- option.getLongOpt() + " to change this value.");
- }
- }
- }
-
- private File findParentDir(File path) {
- File dir = path;
- while (!dir.exists()) {
- dir = dir.getParentFile();
- }
- return dir;
- }
-
- private PropertiesFileUpdate getServerProperties() {
- String sysprop = System.getProperty("rhq.server.properties-file");
- if (sysprop == null) {
- throw new RuntimeException("The required system property [rhq.server.properties] is not defined.");
- }
-
- File file = new File(sysprop);
- if (!(file.exists() && file.isFile())) {
- throw new RuntimeException("System property [" + sysprop + "] points to in invalid file.");
- }
-
- return new PropertiesFileUpdate(file.getAbsolutePath());
- }
-
- private String getSeedsProperty(String seeds) {
- String[] hosts = seeds.split(",");
- List<String> list = new ArrayList<String>(hosts.length);
- for (String host : hosts) {
- list.add(host + "|" + rpcPort + "|" + nativeTransportPort);
- }
- return StringUtil.collectionToString(list);
- }
-
- private void startNode(DeploymentOptions deploymentOptions) {
- File basedir = new File(deploymentOptions.getBasedir());
- File binDir = new File(basedir, "bin");
-
- File startScript;
- SystemInfo systemInfo = SystemInfoFactory.createSystemInfo();
-
- if (systemInfo.getOperatingSystemType() == OperatingSystemType.WINDOWS) {
- startScript = new File(binDir, "cassandra.bat");
- } else {
- startScript = new File(binDir, "cassandra");
- }
-
- ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript);
- startScriptExe.setWaitForCompletion(0);
- startScriptExe.setArguments(asList("-p", "cassandra.pid"));
-
- ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe);
- if (log.isDebugEnabled()) {
- log.debug(startScript + " returned with exit code [" + results.getExitCode() + "]");
- }
- }
-
- private boolean verifyNodeIsUp(int jmxPort, int retries, long timeout) throws Exception {
- String url = "service:jmx:rmi:///jndi/rmi://localhost:" + jmxPort + "/jmxrmi";
- JMXServiceURL serviceURL = new JMXServiceURL(url);
- JMXConnector connector = null;
- MBeanServerConnection serverConnection = null;
-
-
- Map<String, String> env = new HashMap<String, String>();
- env.put("java.naming.factory.initial", RMIContextFactory.class.getName());
-
- for (int i = 0; i < retries; ++i) {
- try {
- connector = JMXConnectorFactory.connect(serviceURL, env);
- serverConnection = connector.getMBeanServerConnection();
- ObjectName storageService = new ObjectName("org.apache.cassandra.db:type=StorageService");
- Boolean nativeTransportRunning = (Boolean) serverConnection.getAttribute(storageService,
- "NativeTransportRunning");
-
- return nativeTransportRunning;
- } catch (Exception e) {
- if (i < retries) {
- if (log.isDebugEnabled()) {
- log.debug("The storage node is not up.", e);
- } else {
- Throwable rootCause = ThrowableUtil.getRootCause(e);
- log.info("The storage node is not up: " + rootCause.getClass().getName() + ": " +
- rootCause.getMessage());
- }
- log.info("Checking storage node status again in " + (timeout * (i + 1)) + " ms...");
- }
- Thread.sleep(timeout * (i + 1));
- }
- }
- return false;
- }
-
- public void printUsage() {
- Options options = getOptions();
- HelpFormatter helpFormatter = new HelpFormatter();
- String syntax = "rhq-storage-installer.sh [options]";
- String header = "";
-
-// helpFormatter.setNewLine("\n");
- helpFormatter.printHelp(syntax, header, options, null);
- }
-
- public Options getOptions() {
- return options;
- }
-
- public static void main(String[] args) throws Exception {
- CassandraInstaller installer = new CassandraInstaller();
- installer.log.info("Running RHQ Storage Node installer...");
- try {
- CommandLineParser parser = new PosixParser();
- CommandLine cmdLine = parser.parse(installer.getOptions(), args);
- installer.run(cmdLine);
- return;
- } catch (ParseException e) {
- installer.printUsage();
- }
- }
-
-}
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
new file mode 100644
index 0000000..db0a69d
--- /dev/null
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
@@ -0,0 +1,396 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 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, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * 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 and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.storage.installer;
+
+import static java.util.Arrays.asList;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.cassandra.DeploymentOptions;
+import org.rhq.cassandra.UnmanagedDeployer;
+import org.rhq.cassandra.installer.RMIContextFactory;
+import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
+import org.rhq.core.system.OperatingSystemType;
+import org.rhq.core.system.ProcessExecution;
+import org.rhq.core.system.ProcessExecutionResults;
+import org.rhq.core.system.SystemInfo;
+import org.rhq.core.system.SystemInfoFactory;
+import org.rhq.core.util.PropertiesFileUpdate;
+import org.rhq.core.util.StringUtil;
+import org.rhq.core.util.exception.ThrowableUtil;
+
+/**
+ * @author John Sanda
+ */
+public class StorageInstaller {
+
+ static {
+ SystemInfoFactory.disableNativeSystemInfo();
+ }
+
+ private final Log log = LogFactory.getLog(StorageInstaller.class);
+
+ private Options options;
+
+ private File rhqBaseDir;
+
+ private File defaultDir;
+
+ private int jmxPort = 7299;
+
+ private int rpcPort = 9160;
+
+ private int nativeTransportPort = 9142;
+
+ private int storagePort = 7100;
+
+ private int sslStoragePort = 7101;
+
+ private boolean startNode = true;
+
+ private boolean checkStatus = true;
+
+ private File logDir;
+
+ private String commitLogDir = "/var/lib/rhq/storage/commitlog";
+
+ private String dataDir = "/var/lib/rhq/storage/data";
+
+ private String savedCachesDir = "/var/lib/rhq/storage/saved_caches";
+
+ public StorageInstaller() {
+ String basedir = System.getProperty("rhq.server.basedir");
+ rhqBaseDir = new File(basedir);
+ defaultDir = new File(basedir, "storage");
+ logDir = new File(rhqBaseDir, "logs");
+
+ Option hostname = new Option("n", "hostname", true, "The hostname or IP address on which the node will listen for " +
+ "requests. If not specified, defaults to the value returned by InetAddress.getLocalHost().getHostName().");
+ hostname.setArgName("HOSTNAME");
+
+ Option seeds = new Option("s", "seeds", true, "A comma-delimited list of hostnames or IP addresses that " +
+ "serve as contact points. Nodes use this list to find each other and to learn the cluster topology. " +
+ "It does not need to specify all nodes in the cluster. Defaults to this node's hostname.");
+ seeds.setArgName("SEEDS");
+
+ Option jmxPortOption = new Option("j", "jmx-port", true, "The port on which to listen for JMX connections. " +
+ "Defaults to " + jmxPort + ".");
+ jmxPortOption.setArgName("PORT");
+
+ Option nativeTransportPortOption = new Option("c", "client-port", true, "The port on which to " +
+ "listen for client requests. Defaults to " + nativeTransportPort);
+ nativeTransportPortOption.setArgName("PORT");
+
+ Option storagePortOption = new Option(null, "storage-port", true, "The port on which to listen for requests " +
+ " from other nodes. Defaults to " + storagePort);
+ storagePortOption.setArgName("PORT");
+
+ Option sslStoragePortOption = new Option(null, "ssl-storage-port", true, "The port on which to listen for " +
+ "encrypted requests from other nodes. Only used when encryption is enabled. Defaults to " + sslStoragePort);
+ sslStoragePortOption.setArgName("PORT");
+
+ Option startOption = new Option(null, "start", true, "Start the storage node after installing it on disk. " +
+ "Defaults to true.");
+ startOption.setArgName("true|false");
+
+ Option checkStatus = new Option(null, "check-status", true, "Check the node status to verify that it is up " +
+ "after starting it. This option is ignored if the start option is not set. Defaults to true.");
+ checkStatus.setArgName("true|false");
+
+ Option commitLogOption = new Option(null, "commitlog", true, "The directory where the storage node keeps " +
+ "commit log files. Defaults to " + commitLogDir + ".");
+ commitLogOption.setArgName("DIR");
+
+ Option dataDirOption = new Option(null, "data", true, "The directory where the storage node keeps data files. " +
+ "Defaults to " + dataDir + ".");
+ dataDirOption.setArgName("DIR");
+
+ Option savedCachesDirOption = new Option(null, "saved-caches", true, "The directory where the storage node " +
+ "keeps saved cache files. Defaults to " + savedCachesDir + ".");
+ savedCachesDirOption.setArgName("DIR");
+
+ options = new Options()
+ .addOption(new Option("h", "help", false, "Show this message."))
+ .addOption(hostname)
+ //.addOption(seeds)
+ .addOption(jmxPortOption)
+ .addOption(startOption)
+ .addOption(checkStatus)
+ .addOption(commitLogOption)
+ .addOption(dataDirOption)
+ .addOption(savedCachesDirOption)
+ .addOption(nativeTransportPortOption)
+ .addOption(storagePortOption)
+ .addOption(sslStoragePortOption);
+ }
+
+ public void run(CommandLine cmdLine) throws Exception {
+ if (cmdLine.hasOption("h")) {
+ printUsage();
+ } else {
+ DeploymentOptions deploymentOptions = new DeploymentOptions();
+
+ File basedir;
+ if (cmdLine.hasOption("d")) {
+ basedir = new File(cmdLine.getOptionValue("d"));
+ } else {
+ basedir = defaultDir;
+ }
+ deploymentOptions.setBasedir(basedir.getAbsolutePath());
+
+ String hostname;
+ if (cmdLine.hasOption("n")) {
+ hostname = cmdLine.getOptionValue("n");
+ } else {
+ hostname = InetAddress.getLocalHost().getHostName();
+ }
+ deploymentOptions.setListenAddress(hostname);
+ deploymentOptions.setRpcAddress(hostname);
+
+ // TODO add support for getting updated seeds list
+ // Rather than have the user specify the seeds for each node, the installer can
+ // obtain the list either from the RHQ server or directly from querying the
+ // database.
+ String seeds = hostname;
+ deploymentOptions.setSeeds(seeds);
+
+ commitLogDir = cmdLine.getOptionValue("commitlog", commitLogDir);
+ dataDir = cmdLine.getOptionValue("data", dataDir);
+ savedCachesDir = cmdLine.getOptionValue("saved-caches", savedCachesDir);
+
+ deploymentOptions.setCommitLogDir(cmdLine.getOptionValue(commitLogDir));
+ deploymentOptions.setDataDir(dataDir);
+ deploymentOptions.setSavedCachesDir(savedCachesDir);
+ deploymentOptions.setLogDir(logDir.getAbsolutePath());
+ deploymentOptions.setLoggingLevel("INFO");
+ deploymentOptions.setRpcPort(rpcPort);
+ deploymentOptions.setJmxPort(getPort(cmdLine, "jmx-port", jmxPort));
+ deploymentOptions.setNativeTransportPort(getPort(cmdLine, "client-port", nativeTransportPort));
+ deploymentOptions.setStoragePort(getPort(cmdLine, "storage-port", storagePort));
+ deploymentOptions.setSslStoragePort(getPort(cmdLine, "ssl-storage-port", sslStoragePort));
+ deploymentOptions.load();
+
+ checkPerms(options.getOption("saved-caches"), savedCachesDir);
+ checkPerms(options.getOption("commitlog"), commitLogDir);
+ checkPerms(options.getOption("data"), dataDir);
+
+ UnmanagedDeployer deployer = new UnmanagedDeployer();
+ deployer.unpackBundle();
+ deployer.deploy(deploymentOptions, 1);
+ log.info("Finished installing RHQ Storage Node. Performing post-install clean up...");
+ deployer.cleanUpBundle();
+
+ log.info("Updating rhq-server.properties...");
+ PropertiesFileUpdate serverPropertiesUpdater = getServerProperties();
+ try {
+ serverPropertiesUpdater.update("rhq.cassandra.seeds", getSeedsProperty(seeds));
+ } catch (IOException e) {
+ throw new RuntimeException("An error occurred while trying to update RHQ server properties", e);
+ }
+
+ if (cmdLine.hasOption("start")) {
+ startNode = Boolean.parseBoolean(cmdLine.getOptionValue("s"));
+ }
+ if (startNode) {
+ log.info("Starting RHQ Storage Node");
+ startNode(deploymentOptions);
+
+ if (cmdLine.hasOption("check-status")) {
+ checkStatus = Boolean.parseBoolean(cmdLine.getOptionValue("c"));
+ }
+ if (checkStatus) {
+ if (verifyNodeIsUp(jmxPort, 5, 3000)) {
+ log.info("RHQ Storage Node is up and running");
+ } else {
+ log.warn("Could not verify that the node is up and running.");
+ }
+ }
+ }
+ log.info("Installation of the storage node is complete.");
+ }
+ }
+
+ private int getPort(CommandLine cmdLine, String option, int defaultValue) {
+ return Integer.parseInt(cmdLine.getOptionValue(option, Integer.toString(defaultValue)));
+ }
+
+ private void checkPerms(Option option, String path) {
+ File dir = new File(path);
+
+ if (dir.exists()) {
+ if (dir.isFile()) {
+ log.warn(path + " is not a directory. Use the --" + option.getLongOpt() + " to change this value.");
+ }
+ } else {
+ File parent = findParentDir(new File(path));
+ if (!parent.canWrite()) {
+ log.warn("The user running this installer does not appear to have write permissions to " + parent +
+ ". Either make sure that the user running the storage node has write permissions or use the --" +
+ option.getLongOpt() + " to change this value.");
+ }
+ }
+ }
+
+ private File findParentDir(File path) {
+ File dir = path;
+ while (!dir.exists()) {
+ dir = dir.getParentFile();
+ }
+ return dir;
+ }
+
+ private PropertiesFileUpdate getServerProperties() {
+ String sysprop = System.getProperty("rhq.server.properties-file");
+ if (sysprop == null) {
+ throw new RuntimeException("The required system property [rhq.server.properties] is not defined.");
+ }
+
+ File file = new File(sysprop);
+ if (!(file.exists() && file.isFile())) {
+ throw new RuntimeException("System property [" + sysprop + "] points to in invalid file.");
+ }
+
+ return new PropertiesFileUpdate(file.getAbsolutePath());
+ }
+
+ private String getSeedsProperty(String seeds) {
+ String[] hosts = seeds.split(",");
+ List<String> list = new ArrayList<String>(hosts.length);
+ for (String host : hosts) {
+ list.add(host + "|" + rpcPort + "|" + nativeTransportPort);
+ }
+ return StringUtil.collectionToString(list);
+ }
+
+ private void startNode(DeploymentOptions deploymentOptions) {
+ File basedir = new File(deploymentOptions.getBasedir());
+ File binDir = new File(basedir, "bin");
+
+ File startScript;
+ SystemInfo systemInfo = SystemInfoFactory.createSystemInfo();
+
+ if (systemInfo.getOperatingSystemType() == OperatingSystemType.WINDOWS) {
+ startScript = new File(binDir, "cassandra.bat");
+ } else {
+ startScript = new File(binDir, "cassandra");
+ }
+
+ ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript);
+ startScriptExe.setWaitForCompletion(0);
+ startScriptExe.setArguments(asList("-p", "cassandra.pid"));
+
+ ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe);
+ if (log.isDebugEnabled()) {
+ log.debug(startScript + " returned with exit code [" + results.getExitCode() + "]");
+ }
+ }
+
+ private boolean verifyNodeIsUp(int jmxPort, int retries, long timeout) throws Exception {
+ String url = "service:jmx:rmi:///jndi/rmi://localhost:" + jmxPort + "/jmxrmi";
+ JMXServiceURL serviceURL = new JMXServiceURL(url);
+ JMXConnector connector = null;
+ MBeanServerConnection serverConnection = null;
+
+
+ Map<String, String> env = new HashMap<String, String>();
+ env.put("java.naming.factory.initial", RMIContextFactory.class.getName());
+
+ for (int i = 0; i < retries; ++i) {
+ try {
+ connector = JMXConnectorFactory.connect(serviceURL, env);
+ serverConnection = connector.getMBeanServerConnection();
+ ObjectName storageService = new ObjectName("org.apache.cassandra.db:type=StorageService");
+ Boolean nativeTransportRunning = (Boolean) serverConnection.getAttribute(storageService,
+ "NativeTransportRunning");
+
+ return nativeTransportRunning;
+ } catch (Exception e) {
+ if (i < retries) {
+ if (log.isDebugEnabled()) {
+ log.debug("The storage node is not up.", e);
+ } else {
+ Throwable rootCause = ThrowableUtil.getRootCause(e);
+ log.info("The storage node is not up: " + rootCause.getClass().getName() + ": " +
+ rootCause.getMessage());
+ }
+ log.info("Checking storage node status again in " + (timeout * (i + 1)) + " ms...");
+ }
+ Thread.sleep(timeout * (i + 1));
+ }
+ }
+ return false;
+ }
+
+ public void printUsage() {
+ Options options = getOptions();
+ HelpFormatter helpFormatter = new HelpFormatter();
+ String syntax = "rhq-storage-installer.sh [options]";
+ String header = "";
+
+// helpFormatter.setNewLine("\n");
+ helpFormatter.printHelp(syntax, header, options, null);
+ }
+
+ public Options getOptions() {
+ return options;
+ }
+
+ public static void main(String[] args) throws Exception {
+ StorageInstaller installer = new StorageInstaller();
+ installer.log.info("Running RHQ Storage Node installer...");
+ try {
+ CommandLineParser parser = new PosixParser();
+ CommandLine cmdLine = parser.parse(installer.getOptions(), args);
+ installer.run(cmdLine);
+ return;
+ } catch (ParseException e) {
+ installer.printUsage();
+ }
+ }
+
+}
diff --git a/modules/common/cassandra-installer/src/main/resources/module/main/module.xml b/modules/common/cassandra-installer/src/main/resources/module/main/module.xml
index 068ff24..f9d19ae 100644
--- a/modules/common/cassandra-installer/src/main/resources/module/main/module.xml
+++ b/modules/common/cassandra-installer/src/main/resources/module/main/module.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="${moduleName}">
- <main-class name="org.rhq.cassandra.installer.CassandraInstaller"/>
+ <main-class name="org.rhq.storage.installer.StorageInstaller"/>
<resources>
<resource-root path="${project.build.finalName}.jar"/>
11 years, 1 month
- 1
- 0
[rhq] Branch 'bug/rhq-1' - 2 commits - modules/enterprise pom.xml
by mazz
modules/enterprise/server/installer/pom.xml | 1 -
pom.xml | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d2a561efd9649fe97175894531407615a4cd7d8c
Merge: e2bae51 9d24ff5
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 16:48:49 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 9d24ff5f20e37996594ebc6fa2f9d9bcc7c955ca
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 16:46:43 2013 -0400
fix installer ant references
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 4936d3f..185cafe 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -20,7 +20,6 @@
<properties>
<moduleName>org.rhq.${project.artifactId}</moduleName>
<moduleDir>org/rhq/${project.artifactId}</moduleDir>
- <ant.version>1.6.5</ant.version> <!-- the version used by dbutils that we need to depend on -->
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index f3823c3..665f7b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
<commons-validator.version>1.1.4</commons-validator.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-configuration.version>1.6</commons-configuration.version>
+ <ant.version>1.8.4</ant.version>
<junit.version>4.8.2</junit.version>
<liquibase-core.version>1.9.5</liquibase-core.version>
@@ -823,13 +824,13 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
@@ -920,7 +921,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<!-- This includes the <if> task, and a bunch of other handy tasks. -->
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise pom.xml
by mazz
modules/enterprise/server/installer/pom.xml | 1 -
pom.xml | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9d24ff5f20e37996594ebc6fa2f9d9bcc7c955ca
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 16:46:43 2013 -0400
fix installer ant references
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 4936d3f..185cafe 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -20,7 +20,6 @@
<properties>
<moduleName>org.rhq.${project.artifactId}</moduleName>
<moduleDir>org/rhq/${project.artifactId}</moduleDir>
- <ant.version>1.6.5</ant.version> <!-- the version used by dbutils that we need to depend on -->
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index f3823c3..665f7b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
<commons-validator.version>1.1.4</commons-validator.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-configuration.version>1.6</commons-configuration.version>
+ <ant.version>1.8.4</ant.version>
<junit.version>4.8.2</junit.version>
<liquibase-core.version>1.9.5</liquibase-core.version>
@@ -823,13 +824,13 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
@@ -920,7 +921,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.4</version>
+ <version>${ant.version}</version>
</dependency>
<!-- This includes the <if> task, and a bunch of other handy tasks. -->
11 years, 1 month
- 1
- 0
[rhq] Branch 'bug/rhq-1' - 3 commits - modules/enterprise
by mazz
modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml | 4 ++-
modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml | 7 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 11 +++-------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java | 2 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java | 2 -
5 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit e2bae516376dfd5f33ac9cf495c58d08356055c7
Merge: ce99967 0189554
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:34:47 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 018955418ebd767b1996caac1729bfda58ece561
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Mar 26 18:29:38 2013 +0100
Changing the return type in for the findOperationDefinitionsByCriteria() signature from List to PageList. Now there is no need to overcast the result.
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
index e675d9a..21dc048 100644
--- a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
@@ -6,4 +6,11 @@
<method>void uninventoryAllResourcesByAgent(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.resource.Agent)</method>
<justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
</difference>
+ <difference>
+ <className>org/rhq/enterprise/server/operation/OperationManagerRemote</className>
+ <differenceType>7006</differenceType> <!-- method added to an interface -->
+ <method>java.util.List findOperationDefinitionsByCriteria(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.criteria.OperationDefinitionCriteria)</method>
+ <to>org.rhq.core.domain.util.PageList</to>
+ <justification>Method Return Type changed. Returning the PageList instead of List. PageList is assignable to a List variable, therefore this change is safe.</justification>
+ </difference>
</differences>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
index e7151fb..088f13e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
@@ -1994,17 +1994,15 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
}
}
- @SuppressWarnings("unchecked")
- public List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
+ public PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
OperationDefinitionCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
- CriteriaQueryRunner<OperationDefinition> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<OperationDefinition> queryRunner = new CriteriaQueryRunner<OperationDefinition>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2013,12 +2011,11 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
subject.getId());
}
- CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new CriteriaQueryRunner<ResourceOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(Subject subject,
GroupOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2027,7 +2024,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
subject.getId());
}
- CriteriaQueryRunner<GroupOperationHistory> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<GroupOperationHistory> queryRunner = new CriteriaQueryRunner<GroupOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
index bce2a18..2d1ea239 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
@@ -740,7 +740,7 @@ public interface OperationManagerLocal {
*/
void unscheduleGroupOperation(Subject subject, String jobId, int resourceGroupId) throws UnscheduleException;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
index 8a4bf1d..3c6e81d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
@@ -267,7 +267,7 @@ public interface OperationManagerRemote {
List<GroupOperationSchedule> findScheduledGroupOperations(Subject subject, int groupId) throws Exception;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
commit 3b9efe8bbf6e88ab90c0e25b289e3598d90d0d7f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:21:21 2013 -0400
BZ 824010 - don't do this yet - it will blow away native prefs and we don't want to support this file based prefs yet
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 6601de3..a24f374 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
@@ -133,7 +133,9 @@
</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>
@@ -342,4 +344,4 @@ Jar File: ${rhq.agent.update.jar-file}
<target name="process-exit-code-unix" if="_launcher.unix.successful">
<echo>Launched Unix agent successfully</echo>
</target>
-</project>
\ No newline at end of file
+</project>
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by Jiri Kremser
modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml | 7 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 11 +++-------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java | 2 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java | 2 -
4 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 018955418ebd767b1996caac1729bfda58ece561
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Mar 26 18:29:38 2013 +0100
Changing the return type in for the findOperationDefinitionsByCriteria() signature from List to PageList. Now there is no need to overcast the result.
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
index e675d9a..21dc048 100644
--- a/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.6.0.xml
@@ -6,4 +6,11 @@
<method>void uninventoryAllResourcesByAgent(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.resource.Agent)</method>
<justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
</difference>
+ <difference>
+ <className>org/rhq/enterprise/server/operation/OperationManagerRemote</className>
+ <differenceType>7006</differenceType> <!-- method added to an interface -->
+ <method>java.util.List findOperationDefinitionsByCriteria(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.criteria.OperationDefinitionCriteria)</method>
+ <to>org.rhq.core.domain.util.PageList</to>
+ <justification>Method Return Type changed. Returning the PageList instead of List. PageList is assignable to a List variable, therefore this change is safe.</justification>
+ </difference>
</differences>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
index e7151fb..088f13e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
@@ -1994,17 +1994,15 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
}
}
- @SuppressWarnings("unchecked")
- public List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
+ public PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject,
OperationDefinitionCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
- CriteriaQueryRunner<OperationDefinition> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<OperationDefinition> queryRunner = new CriteriaQueryRunner<OperationDefinition>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2013,12 +2011,11 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
subject.getId());
}
- CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<ResourceOperationHistory> queryRunner = new CriteriaQueryRunner<ResourceOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
- @SuppressWarnings("unchecked")
public PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(Subject subject,
GroupOperationHistoryCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
@@ -2027,7 +2024,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
subject.getId());
}
- CriteriaQueryRunner<GroupOperationHistory> queryRunner = new CriteriaQueryRunner(criteria, generator,
+ CriteriaQueryRunner<GroupOperationHistory> queryRunner = new CriteriaQueryRunner<GroupOperationHistory>(criteria, generator,
entityManager);
return queryRunner.execute();
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
index bce2a18..2d1ea239 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
@@ -740,7 +740,7 @@ public interface OperationManagerLocal {
*/
void unscheduleGroupOperation(Subject subject, String jobId, int resourceGroupId) throws UnscheduleException;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
index 8a4bf1d..3c6e81d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java
@@ -267,7 +267,7 @@ public interface OperationManagerRemote {
List<GroupOperationSchedule> findScheduledGroupOperations(Subject subject, int groupId) throws Exception;
- List<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
+ PageList<OperationDefinition> findOperationDefinitionsByCriteria(Subject subject, OperationDefinitionCriteria criteria);
PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(Subject subject,
ResourceOperationHistoryCriteria criteria);
11 years, 1 month
- 1
- 0
[rhq] modules/enterprise
by mazz
modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3b9efe8bbf6e88ab90c0e25b289e3598d90d0d7f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:21:21 2013 -0400
BZ 824010 - don't do this yet - it will blow away native prefs and we don't want to support this file based prefs yet
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 6601de3..a24f374 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
@@ -133,7 +133,9 @@
</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>
@@ -342,4 +344,4 @@ Jar File: ${rhq.agent.update.jar-file}
<target name="process-exit-code-unix" if="_launcher.unix.successful">
<echo>Launched Unix agent successfully</echo>
</target>
-</project>
\ No newline at end of file
+</project>
11 years, 1 month
- 1
- 0
[rhq] Branch 'bug/rhq-1' - 12 commits - code-coverage/pom.xml etc/classloaders-test etc/eclipse-tools modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/test-utils pom.xml
by mazz
code-coverage/pom.xml | 7
etc/classloaders-test/plugin1/pom.xml | 18
etc/classloaders-test/plugin2/pom.xml | 18
etc/eclipse-tools/RHQ | 59 -
modules/common/ant-bundle/pom.xml | 3
modules/common/jboss-as/pom.xml | 4
modules/core/client-api/pom.xml | 1
modules/core/dbutils/pom.xml | 8
modules/core/gui/pom.xml | 6
modules/core/util/src/main/java/org/rhq/core/util/preferences/FilePreferences.java | 21
modules/enterprise/agent/pom.xml | 2
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/pom.xml | 2
modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java | 139 +++
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/comm/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 7
modules/enterprise/gui/coregui/pom.xml | 1
modules/enterprise/gui/portal-war/pom.xml | 7
modules/enterprise/gui/remoting-war/pom.xml | 1
modules/enterprise/gui/rest-war/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 4
modules/enterprise/remoting/client-deps/pom.xml | 10
modules/enterprise/scripting/javascript/pom.xml | 1
modules/enterprise/scripting/python/pom.xml | 1
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc | 9
modules/enterprise/server/client-api/pom.xml | 1
modules/enterprise/server/installer/pom.xml | 10
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 361 +++++++++-
modules/enterprise/server/jar/pom.xml | 15
modules/enterprise/server/plugins/alert-roles/pom.xml | 1
modules/enterprise/server/plugins/ant-bundle/pom.xml | 3
modules/enterprise/server/plugins/cobbler/pom.xml | 1
modules/enterprise/server/plugins/groovy-script/pom.xml | 1
modules/enterprise/server/sars/agent-sar/pom.xml | 1
modules/helpers/perftest-support/pom.xml | 7
modules/helpers/rest-docs-generator/pom.xml | 1
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 1
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 3
modules/plugins/ant-bundle/pom.xml | 3
modules/plugins/jboss-as-5/pom.xml | 9
modules/plugins/jboss-as/pom.xml | 12
modules/plugins/jboss-cache-v3/pom.xml | 3
modules/plugins/pom.xml | 1
modules/plugins/raw-config-test/pom.xml | 2
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 -
modules/test-utils/pom.xml | 2
pom.xml | 124 +++
57 files changed, 742 insertions(+), 241 deletions(-)
New commits:
commit ce99967d134d6ab2bf0664d14d20c549625dc981
Merge: 2e69f77 3354fcc
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 15:16:07 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 3354fcc2e4f806194b523942ccb63ca6adf00415
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Mar 26 12:21:50 2013 -0500
[BZ 923458] More maven dependency and plugin version updates.
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index cacf523..efa72b1 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -18,7 +18,7 @@
<property>
<name>code-coverage</name>
</property>
- </activation>
+ </activation>
<build>
<plugins>
<plugin>
@@ -60,7 +60,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -179,7 +178,7 @@
<include name="**/target/generated-sources/*" />
</dirset>
</sourcefiles>
- </group>
+ </group>
</structure>
<html destdir="${project.reporting.outputDirectory}/coverage-report/overall" />
<xml destfile="${project.reporting.outputDirectory}/coverage-report/overall/coverage-report.xml" />
@@ -193,7 +192,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -202,4 +200,3 @@
</profile>
</profiles>
</project>
-
\ No newline at end of file
diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml
index 3521a91..cc0dd51 100644
--- a/etc/classloaders-test/plugin1/pom.xml
+++ b/etc/classloaders-test/plugin1/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml
index 7c2add2..e4549d3 100644
--- a/etc/classloaders-test/plugin2/pom.xml
+++ b/etc/classloaders-test/plugin2/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 4cf6703..26e7795 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -53,20 +53,17 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</dependency>
<!-- include some optional Ant tasks for users to be able to use -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</dependency>
<dependency>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index d3bf151..a53545f 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -16,10 +16,10 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index c03f268..acd19c9 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 41351ed..f6d5f5a 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -34,12 +34,11 @@
<artifactId>rhq-core-util</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- 3rd Party Deps -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -47,9 +46,8 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 365535a..b3b7706 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -16,10 +16,6 @@
<description>JSF utility classes, validators, converters, etc. that are used by both enterprise and embedded
</description>
- <properties>
- <!-- dependency versions -->
- <el.version>1.0</el.version>
- </properties>
<dependencies>
@@ -65,9 +61,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
- <!-- by JBossAS -->
</dependency>
<dependency>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d1200f6..cb1fad0 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -63,7 +63,6 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<!-- 3rd Party Deps -->
@@ -87,7 +86,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version> <!-- just using the one that is also used by AS7 -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 3b66b92..ddec938 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -37,14 +37,12 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 822d405..c312dc1 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -87,7 +86,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 19208e8..333aa5d 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -62,7 +62,7 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
- <!-- adding so we can extend DefaultServlet
+ <!-- adding so we can extend DefaultServlet
Chose version 2.0.1 so it's compatible with info here for JBoss 4.2.3
http://community.jboss.org/wiki/VersionOfTomcatInJBossAS-->
<dependency>
@@ -76,11 +76,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -104,7 +103,6 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
</dependency>
<dependency>
@@ -120,7 +118,6 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index d890830..a3dfde1 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -151,7 +151,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 6c12259..4ee28ed 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -17,7 +17,6 @@
<properties>
<!-- dependency versions -->
- <el.version>1.0</el.version>
<jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
<!-- plugin versions -->
@@ -75,19 +74,16 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -129,7 +125,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>${el.version}</version>
<scope>provided</scope> <!-- by JBossAS Tomcat -->
</dependency>
@@ -143,7 +138,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -289,7 +283,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.6.4</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml
index 9570336..70ece03 100644
--- a/modules/enterprise/gui/remoting-war/pom.xml
+++ b/modules/enterprise/gui/remoting-war/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index 0797145..5d3dbfc 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -48,7 +47,6 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>1.0.2.Final</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index fc164c9..e371826 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -57,20 +57,16 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <!-- Yes, this is actually meant to be compile, and not test, scoped. -->
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 61b7c19..b411a87 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -45,11 +45,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
<dependency>
<groupId>i18nlog</groupId>
diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml
index b1d6553..32eb12d 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml
index 8e7ff39..f6a1149c 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index c645073..6bb6ea2 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 5e5cdd1..4936d3f 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -63,15 +63,13 @@
<!-- we need to package this (and ant) in our module -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
@@ -136,11 +134,11 @@
<artifactId>rhq-jboss-as-dmr-client</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</artifactItem>
<artifactItem>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index b86af52..1a70da8 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -175,15 +175,10 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
</dependency>
<!-- Required by a couple APL classes - TODO: Remove this once APL has been removed. -->
<!-- also required by EJB3 Embedded (test scope) -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -290,13 +285,6 @@
<scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- <!-- somehow this is needed otherwise the hibernate stuff doesn't initialize in our tests -->
- </dependency>
<dependency>
<groupId>org.snmp4j</groupId>
@@ -308,7 +296,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4</version>
</dependency>
<dependency>
@@ -868,7 +855,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
</dependency>
</dependencies>
@@ -996,7 +982,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
<configuration>
<includes>
<include>**/*Remote</include>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 4f8c6a5..31acb49 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -18,7 +18,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 4226e21..5227e8c 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -75,20 +75,17 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</artifactItem>
<!-- include some optional Ant tasks for users to be able to use -->
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 2c81751..94cbe7d 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -30,7 +30,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index ea20099..ce163b8 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -23,7 +23,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.opensymphony.quartz</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 6f2cc2e..e5639f9 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <!-- make sure you match that which is used by standalone agent! -->
</dependency>
<dependency>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 4136b47..43458a5 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -14,14 +14,12 @@
</description>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -68,7 +66,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml
index 1dff5bd..e72aab4 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
<executions>
<execution>
<!-- Compile the sources i.e. the processor plugin-->
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 9469947..03dfcc9 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index b3370a3..e09207a 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -57,7 +57,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.on</groupId>
<artifactId>jopr-tomcat-plugin</artifactId>
@@ -113,7 +113,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0c750b6..cc1a8a5 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -47,20 +47,17 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</artifactItem>
<!-- include some optional Ant tasks for users to be able to use -->
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 3eb65a7..abc21d5 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -187,9 +187,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -443,14 +442,14 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -665,7 +664,7 @@
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 8a5b6c9..1fee627 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -18,7 +18,7 @@
<properties>
<rhq.internal>false</rhq.internal>
</properties>
-
+
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
@@ -99,7 +99,7 @@
</goals>
<configuration>
<artifactItems>
- <!--
+ <!--
<artifactItem>
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
@@ -124,9 +124,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>org.rhq</groupId>
@@ -151,9 +150,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -197,7 +195,7 @@
<executions>
<execution>
<phase>pre-integration-test</phase>
-
+
<configuration>
<target>
<echo>Setting up plugin dependencies...</echo>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 34bdffe..c83611c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
@@ -494,7 +493,7 @@
</build>
</profile>
</profiles>
-
+
<reporting>
<plugins>
<plugin>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 9af3938..9d6a147 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope> <!-- by RHQ container -->
</dependency>
diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml
index c615a39..19a48fe 100644
--- a/modules/plugins/raw-config-test/pom.xml
+++ b/modules/plugins/raw-config-test/pom.xml
@@ -69,12 +69,10 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.7.1</version>
</artifactItem>
<artifactItem>
<groupId>commons-configuration</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 07e3aa1..f536119 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -17,7 +17,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -37,7 +36,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.2</version>
</dependency>
<dependency>
<groupId>org.unitils</groupId>
diff --git a/pom.xml b/pom.xml
index 0d6a847..f3823c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
<servlet-api.version>2.4</servlet-api.version>
<mockito-core.version>1.9.0</mockito-core.version>
+ <el.version>1.0</el.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
@@ -447,6 +448,12 @@
<version>${commons-httpclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+
<!-- GNU GetOpt (any modules that need to do command-line argument parsing should use this) -->
<dependency>
<groupId>gnu-getopt</groupId>
@@ -764,6 +771,102 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${el.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -827,7 +930,7 @@
<version>${ant.contrib.version}</version>
<exclusions>
<exclusion>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
@@ -861,7 +964,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -938,6 +1041,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -1599,7 +1707,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -1659,7 +1766,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1935,6 +2041,12 @@
<version>2.6</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
+ </plugin>
+
<!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
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;
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();
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;
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;
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"
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"
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%
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
commit cc100b6f0791bd5dec07c9d5cadf119cf744a8d2
Author: Ian Springer <ispringer(a)apptegic.com>
Date: Mon Mar 25 12:35:29 2013 -0400
update required jdk and maven versions to match what's on https://docs.jboss.org/author/display/RHQ/Building+RHQ
diff --git a/pom.xml b/pom.xml
index 136cd73..0d6a847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1193,10 +1193,10 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>2.1.0</version>
+ <version>3.0</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.6,1.8)</version> <!-- 1.6.x, 1.7.x -->
+ <version>[1.7,1.8)</version> <!-- 1.7.x -->
</requireJavaVersion>
</rules>
</configuration>
11 years, 1 month
- 1
- 0
[rhq] Branch 'bug/rhq-1' - modules/core
by mazz
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/AbstractIgnoreTypesInventoryManagerBaseTest.java | 11 ++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 2e69f7701559033a46f534f13130ad64af997f3c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 26 14:37:10 2013 -0400
BZ 535289 - clean up tests by purging inventory data persisted to disk
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
index 452a4ff..6533b21 100644
--- 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
@@ -21,6 +21,7 @@ package org.rhq.core.pc.inventory;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.concurrent.CountDownLatch;
@@ -29,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.TargetsContainer;
@@ -47,6 +49,7 @@ 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.core.util.file.FileUtil;
import org.rhq.test.arquillian.AfterDiscovery;
import org.rhq.test.arquillian.BeforeDiscovery;
import org.rhq.test.arquillian.MockingServerServices;
@@ -87,6 +90,14 @@ public abstract class AbstractIgnoreTypesInventoryManagerBaseTest extends Arquil
protected abstract void initializeIgnoredTypes();
+ @AfterMethod
+ public void cleanUpPluginContainer() {
+ File dataDir = pluginContainerConfiguration.getDataDirectory();
+ System.out.println("Purging data directory: " + dataDir);
+ pluginContainer.getInventoryManager().shutdown();
+ FileUtil.purge(dataDir, true);
+ }
+
@BeforeDiscovery
public void resetServerServices() throws Exception {
platform = null;
11 years, 1 month
- 1
- 0
[rhq] code-coverage/pom.xml etc/classloaders-test modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/test-utils pom.xml
by snegrea
code-coverage/pom.xml | 7
etc/classloaders-test/plugin1/pom.xml | 18 -
etc/classloaders-test/plugin2/pom.xml | 18 -
modules/common/ant-bundle/pom.xml | 3
modules/common/jboss-as/pom.xml | 4
modules/core/client-api/pom.xml | 1
modules/core/dbutils/pom.xml | 8
modules/core/gui/pom.xml | 6
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 7
modules/enterprise/gui/coregui/pom.xml | 1
modules/enterprise/gui/portal-war/pom.xml | 7
modules/enterprise/gui/remoting-war/pom.xml | 1
modules/enterprise/gui/rest-war/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 4
modules/enterprise/remoting/client-deps/pom.xml | 10
modules/enterprise/scripting/javascript/pom.xml | 1
modules/enterprise/scripting/python/pom.xml | 1
modules/enterprise/server/client-api/pom.xml | 1
modules/enterprise/server/installer/pom.xml | 10
modules/enterprise/server/jar/pom.xml | 15 -
modules/enterprise/server/plugins/alert-roles/pom.xml | 1
modules/enterprise/server/plugins/ant-bundle/pom.xml | 3
modules/enterprise/server/plugins/cobbler/pom.xml | 1
modules/enterprise/server/plugins/groovy-script/pom.xml | 1
modules/enterprise/server/sars/agent-sar/pom.xml | 1
modules/helpers/perftest-support/pom.xml | 7
modules/helpers/rest-docs-generator/pom.xml | 1
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 1
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 3
modules/plugins/ant-bundle/pom.xml | 3
modules/plugins/jboss-as-5/pom.xml | 9
modules/plugins/jboss-as/pom.xml | 12 -
modules/plugins/jboss-cache-v3/pom.xml | 3
modules/plugins/pom.xml | 1
modules/plugins/raw-config-test/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 120 +++++++++-
40 files changed, 147 insertions(+), 155 deletions(-)
New commits:
commit 3354fcc2e4f806194b523942ccb63ca6adf00415
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Mar 26 12:21:50 2013 -0500
[BZ 923458] More maven dependency and plugin version updates.
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index cacf523..efa72b1 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -18,7 +18,7 @@
<property>
<name>code-coverage</name>
</property>
- </activation>
+ </activation>
<build>
<plugins>
<plugin>
@@ -60,7 +60,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -179,7 +178,7 @@
<include name="**/target/generated-sources/*" />
</dirset>
</sourcefiles>
- </group>
+ </group>
</structure>
<html destdir="${project.reporting.outputDirectory}/coverage-report/overall" />
<xml destfile="${project.reporting.outputDirectory}/coverage-report/overall/coverage-report.xml" />
@@ -193,7 +192,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -202,4 +200,3 @@
</profile>
</profiles>
</project>
-
\ No newline at end of file
diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml
index 3521a91..cc0dd51 100644
--- a/etc/classloaders-test/plugin1/pom.xml
+++ b/etc/classloaders-test/plugin1/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml
index 7c2add2..e4549d3 100644
--- a/etc/classloaders-test/plugin2/pom.xml
+++ b/etc/classloaders-test/plugin2/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 4cf6703..26e7795 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -53,20 +53,17 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</dependency>
<!-- include some optional Ant tasks for users to be able to use -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</dependency>
<dependency>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index d3bf151..a53545f 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -16,10 +16,10 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index c03f268..acd19c9 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 41351ed..f6d5f5a 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -34,12 +34,11 @@
<artifactId>rhq-core-util</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- 3rd Party Deps -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -47,9 +46,8 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 365535a..b3b7706 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -16,10 +16,6 @@
<description>JSF utility classes, validators, converters, etc. that are used by both enterprise and embedded
</description>
- <properties>
- <!-- dependency versions -->
- <el.version>1.0</el.version>
- </properties>
<dependencies>
@@ -65,9 +61,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
- <!-- by JBossAS -->
</dependency>
<dependency>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d1200f6..cb1fad0 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -63,7 +63,6 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<!-- 3rd Party Deps -->
@@ -87,7 +86,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version> <!-- just using the one that is also used by AS7 -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 3b66b92..ddec938 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -37,14 +37,12 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 822d405..c312dc1 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -87,7 +86,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 19208e8..333aa5d 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -62,7 +62,7 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
- <!-- adding so we can extend DefaultServlet
+ <!-- adding so we can extend DefaultServlet
Chose version 2.0.1 so it's compatible with info here for JBoss 4.2.3
http://community.jboss.org/wiki/VersionOfTomcatInJBossAS-->
<dependency>
@@ -76,11 +76,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -104,7 +103,6 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
</dependency>
<dependency>
@@ -120,7 +118,6 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index d890830..a3dfde1 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -151,7 +151,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 6c12259..4ee28ed 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -17,7 +17,6 @@
<properties>
<!-- dependency versions -->
- <el.version>1.0</el.version>
<jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
<!-- plugin versions -->
@@ -75,19 +74,16 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -129,7 +125,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>${el.version}</version>
<scope>provided</scope> <!-- by JBossAS Tomcat -->
</dependency>
@@ -143,7 +138,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -289,7 +283,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.6.4</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml
index 9570336..70ece03 100644
--- a/modules/enterprise/gui/remoting-war/pom.xml
+++ b/modules/enterprise/gui/remoting-war/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index 0797145..5d3dbfc 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -48,7 +47,6 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>1.0.2.Final</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index fc164c9..e371826 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -57,20 +57,16 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <!-- Yes, this is actually meant to be compile, and not test, scoped. -->
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index 61b7c19..b411a87 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -45,11 +45,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
<dependency>
<groupId>i18nlog</groupId>
diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml
index b1d6553..32eb12d 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml
index 8e7ff39..f6a1149c 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index c645073..6bb6ea2 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 5e5cdd1..4936d3f 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -63,15 +63,13 @@
<!-- we need to package this (and ant) in our module -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
@@ -136,11 +134,11 @@
<artifactId>rhq-jboss-as-dmr-client</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</artifactItem>
<artifactItem>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index b86af52..1a70da8 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -175,15 +175,10 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
</dependency>
<!-- Required by a couple APL classes - TODO: Remove this once APL has been removed. -->
<!-- also required by EJB3 Embedded (test scope) -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -290,13 +285,6 @@
<scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- <!-- somehow this is needed otherwise the hibernate stuff doesn't initialize in our tests -->
- </dependency>
<dependency>
<groupId>org.snmp4j</groupId>
@@ -308,7 +296,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4</version>
</dependency>
<dependency>
@@ -868,7 +855,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
</dependency>
</dependencies>
@@ -996,7 +982,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
<configuration>
<includes>
<include>**/*Remote</include>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 4f8c6a5..31acb49 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -18,7 +18,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 4226e21..5227e8c 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -75,20 +75,17 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</artifactItem>
<!-- include some optional Ant tasks for users to be able to use -->
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 2c81751..94cbe7d 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -30,7 +30,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index ea20099..ce163b8 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -23,7 +23,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.opensymphony.quartz</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 6f2cc2e..e5639f9 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <!-- make sure you match that which is used by standalone agent! -->
</dependency>
<dependency>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 4136b47..43458a5 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -14,14 +14,12 @@
</description>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -68,7 +66,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml
index 1dff5bd..e72aab4 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
<executions>
<execution>
<!-- Compile the sources i.e. the processor plugin-->
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 9469947..03dfcc9 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index b3370a3..e09207a 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -57,7 +57,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.on</groupId>
<artifactId>jopr-tomcat-plugin</artifactId>
@@ -113,7 +113,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0c750b6..cc1a8a5 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -47,20 +47,17 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.0</version>
</artifactItem>
<!-- include some optional Ant tasks for users to be able to use -->
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.8.0</version>
</artifactItem>
<artifactItem>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 3eb65a7..abc21d5 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -187,9 +187,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -443,14 +442,14 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -665,7 +664,7 @@
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 8a5b6c9..1fee627 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -18,7 +18,7 @@
<properties>
<rhq.internal>false</rhq.internal>
</properties>
-
+
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
@@ -99,7 +99,7 @@
</goals>
<configuration>
<artifactItems>
- <!--
+ <!--
<artifactItem>
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
@@ -124,9 +124,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>org.rhq</groupId>
@@ -151,9 +150,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -197,7 +195,7 @@
<executions>
<execution>
<phase>pre-integration-test</phase>
-
+
<configuration>
<target>
<echo>Setting up plugin dependencies...</echo>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 34bdffe..c83611c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
@@ -494,7 +493,7 @@
</build>
</profile>
</profiles>
-
+
<reporting>
<plugins>
<plugin>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 9af3938..9d6a147 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope> <!-- by RHQ container -->
</dependency>
diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml
index c615a39..19a48fe 100644
--- a/modules/plugins/raw-config-test/pom.xml
+++ b/modules/plugins/raw-config-test/pom.xml
@@ -69,12 +69,10 @@
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.7.1</version>
</artifactItem>
<artifactItem>
<groupId>commons-configuration</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 07e3aa1..f536119 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -17,7 +17,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -37,7 +36,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.2</version>
</dependency>
<dependency>
<groupId>org.unitils</groupId>
diff --git a/pom.xml b/pom.xml
index 0d6a847..f3823c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
<servlet-api.version>2.4</servlet-api.version>
<mockito-core.version>1.9.0</mockito-core.version>
+ <el.version>1.0</el.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
@@ -447,6 +448,12 @@
<version>${commons-httpclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+
<!-- GNU GetOpt (any modules that need to do command-line argument parsing should use this) -->
<dependency>
<groupId>gnu-getopt</groupId>
@@ -764,6 +771,102 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${el.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -827,7 +930,7 @@
<version>${ant.contrib.version}</version>
<exclusions>
<exclusion>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
@@ -861,7 +964,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -938,6 +1041,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -1599,7 +1707,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -1659,7 +1766,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1935,6 +2041,12 @@
<version>2.6</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
+ </plugin>
+
<!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
11 years, 1 month
- 1
- 0