rhq-commits February 2010

rhq-commits@lists.fedorahosted.org

20 participants
382 discussions

[rhq] Branch 'linux-config' - 43 commits - .classpath etc/apt etc/modules etc/samples modules/common modules/core modules/enterprise modules/helpers modules/jopr modules/plugins modules/pom.xml modules/test-utils pom.xml .settings/org.eclipse.jdt.ui.prefs
by Shannon Hughes 03 Feb '10

03 Feb '10

.classpath | 4 .settings/org.eclipse.jdt.ui.prefs | 4 etc/apt/pom.xml | 2 etc/modules/base-perspective-war/pom.xml | 4 etc/samples/custom-serverplugin/pom.xml | 2 etc/samples/perspectives/sample-perspective/app/pom.xml | 2 etc/samples/perspectives/sample-perspective/perspective/pom.xml | 4 etc/samples/perspectives/sample-perspective/pom.xml | 2 etc/samples/simplereport-serverplugin/pom.xml | 2 etc/samples/skeleton-plugin/pom.xml | 2 modules/common/jboss-as/pom.xml | 2 modules/common/pom.xml | 5 modules/core/client-api/pom.xml | 2 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 6 modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 2 modules/core/domain/pom.xml | 3 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java | 10 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java | 15 + modules/core/gui/pom.xml | 2 modules/core/native-system/pom.xml | 2 modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java | 4 modules/core/plugin-api/pom.xml | 2 modules/core/plugin-container/pom.xml | 2 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 2 modules/core/pom.xml | 7 modules/core/util/pom.xml | 2 modules/enterprise/agent/ant-run.xml | 1 modules/enterprise/agent/pom.xml | 9 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115 ++++++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 94 ++++---- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 91 ------- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 2 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 90 +++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73 ++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 15 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 7 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java | 8 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/comm/pom.xml | 2 modules/enterprise/gui/alert-migration/pom.xml | 6 modules/enterprise/gui/content_http-war/pom.xml | 2 modules/enterprise/gui/installer-war/pom.xml | 2 modules/enterprise/gui/pom.xml | 2 modules/enterprise/gui/portal-war/pom.xml | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java | 15 - modules/enterprise/gui/webdav-war/pom.xml | 2 modules/enterprise/pom.xml | 7 modules/enterprise/remoting/cli/pom.xml | 4 modules/enterprise/remoting/client-api/pom.xml | 2 modules/enterprise/remoting/pom.xml | 2 modules/enterprise/remoting/scripts/pom.xml | 2 modules/enterprise/remoting/webservices/pom.xml | 2 modules/enterprise/server/container-lib/pom.xml | 2 modules/enterprise/server/container/pom.xml | 5 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 3 modules/enterprise/server/ear/pom.xml | 53 +--- modules/enterprise/server/jar/pom.xml | 42 +-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java | 27 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java | 17 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 23 ++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java | 24 ++ modules/enterprise/server/license-gen/jar/pom.xml | 2 modules/enterprise/server/license-gen/maven-plugin/pom.xml | 2 modules/enterprise/server/plugins/alert-email/pom.xml | 7 modules/enterprise/server/plugins/alert-irc/pom.xml | 7 modules/enterprise/server/plugins/alert-microblog/pom.xml | 7 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 7 modules/enterprise/server/plugins/alert-roles/pom.xml | 4 modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 2 modules/enterprise/server/plugins/alert-snmp/pom.xml | 7 modules/enterprise/server/plugins/alert-subject/pom.xml | 2 modules/enterprise/server/plugins/cobbler/pom.xml | 4 modules/enterprise/server/plugins/disk/pom.xml | 5 modules/enterprise/server/plugins/jboss-software/pom.xml | 5 modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 5 modules/enterprise/server/plugins/perspectives/core/pom.xml | 7 modules/enterprise/server/plugins/pom.xml | 7 modules/enterprise/server/plugins/rhnhosted/pom.xml | 5 modules/enterprise/server/plugins/url/pom.xml | 5 modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 modules/enterprise/server/plugins/yum/pom.xml | 5 modules/enterprise/server/pom.xml | 2 modules/enterprise/server/safe-invoker/pom.xml | 2 modules/enterprise/server/sars/agent-sar/pom.xml | 2 modules/enterprise/server/sars/pom.xml | 2 modules/enterprise/server/xml-schemas/pom.xml | 5 modules/helpers/pluginAnnotations/pom.xml | 4 modules/helpers/pluginGen/pom.xml | 4 modules/helpers/pom.xml | 2 modules/helpers/rtfilter/pom.xml | 2 modules/jopr/pom.xml | 4 modules/plugins/aliases/pom.xml | 6 modules/plugins/apache/pom.xml | 2 modules/plugins/augeas/pom.xml | 6 modules/plugins/byteman/pom.xml | 2 modules/plugins/cobbler/pom.xml | 6 modules/plugins/cron/pom.xml | 2 modules/plugins/database/pom.xml | 2 modules/plugins/grub/pom.xml | 2 modules/plugins/hardware/pom.xml | 2 modules/plugins/hibernate/pom.xml | 2 modules/plugins/hosts/pom.xml | 6 modules/plugins/hudson/pom.xml | 4 modules/plugins/iis/pom.xml | 2 modules/plugins/iptables/pom.xml | 2 modules/plugins/irc/pom.xml | 4 modules/plugins/jboss-as-5/pom.xml | 2 modules/plugins/jboss-as/pom.xml | 2 modules/plugins/jboss-cache-v3/pom.xml | 2 modules/plugins/jboss-cache/pom.xml | 2 modules/plugins/jdbctrace/pom.xml | 2 modules/plugins/jira/pom.xml | 2 modules/plugins/jmx/pom.xml | 2 modules/plugins/kickstart/pom.xml | 2 modules/plugins/lsof/pom.xml | 2 modules/plugins/mysql/pom.xml | 2 modules/plugins/netservices/pom.xml | 2 modules/plugins/onewire/pom.xml | 2 modules/plugins/oracle/pom.xml | 6 modules/plugins/perftest/pom.xml | 2 modules/plugins/platform/pom.xml | 2 modules/plugins/pom.xml | 8 modules/plugins/postfix/pom.xml | 2 modules/plugins/postgres/pom.xml | 2 modules/plugins/raw-config-test/pom.xml | 5 modules/plugins/rhq-agent/pom.xml | 2 modules/plugins/rhq-server/pom.xml | 2 modules/plugins/samba/pom.xml | 2 modules/plugins/script/pom.xml | 2 modules/plugins/script2/pom.xml | 32 -- modules/plugins/services/pom.xml | 2 modules/plugins/snmptrapd/pom.xml | 2 modules/plugins/sshd/pom.xml | 2 modules/plugins/sudoers/pom.xml | 2 modules/plugins/tomcat/pom.xml | 2 modules/plugins/twitter/pom.xml | 2 modules/plugins/validate-all-plugins/pom.xml | 2 modules/plugins/virt/pom.xml | 4 modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java | 36 ++- modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java | 22 - modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java | 1 modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/pom.xml | 7 modules/test-utils/pom.xml | 5 pom.xml | 11 151 files changed, 921 insertions(+), 499 deletions(-) New commits: commit 0d3d83f5c5cd39f8c777f166a9a67a242dccb4e5 Merge: 6a0eb34... e01ac13... Author: Shannon Hughes <shughes(a)fred.hughes.lan> Date: Wed Feb 3 11:31:19 2010 -0500 fixed merge conflicts with rich faces Merge branch 'master' into sync Conflicts: pom.xml diff --cc pom.xml index 0b1a3f2,b43da0a..191f86e --- a/pom.xml +++ b/pom.xml @@@ -74,7 -73,8 +73,8 @@@ <postgresql.version>8.4-701.jdbc3</postgresql.version> <h2.version>1.1.117</h2.version> <jtds.version>1.2.2</jtds.version> + <richfaces.version>3.3.2.GA</richfaces.version> + <jline.version>0.9.94</jline.version> - <richfaces.version>3.3.2.SR1</richfaces.version> <sigar.version>1.6.3.82</sigar.version> <quartz.version>1.6.5</quartz.version> <jna.version>3.2.2</jna.version> commit e01ac1302020282dfa2f0583c30ff859089143ea Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 02:56:02 2010 -0500 refactor the jline integration to fix problems and enhance it. this commit will allow the user to select the implementation to use; you can now use the command line option --console (-e) to say if you want the console input to be read by "java" (pure Java implementation), "sigar" (this was the original native console way we had before) or "jline" (which is the new native console way). This allows a user to select a non-native way to read input in case they are running on a platform that doesn't support the native library (jline's native lib or sigar's native lib) or in case the native library has a bug and is causing the agent to crash. If you use "sigar", and you disable the native system API (native --disable), this will cause the console to fallback to the "java" console impl. If user is using "jline", there is no fallback to - if jline is giving problems, you must exit the agent, and specify a --console argument to override the console to use. The default is "jline". diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java index dc6644b..4f00ab1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -28,24 +28,32 @@ import java.io.IOException; */ public interface AgentInputReader { /** + * Indicates if the input is coming from a console (i.e. keyboard) or if its coming from + * a file. + * + * @return <code>true</code> if console is the source of the input; <code>false</code> if file is the source + */ + boolean isConsole(); + + /** * Reads a line from the input console. * * @return the line * @throws IOException */ String readLine() throws IOException; - + /** - * Reads a line from the input console, echoing out the 'mask' character as opposed to the character - * typed by the user. If the console implementation does not support mask echoes, either the - * user-entered character is masked or some other masking is performed in an implementation specific way. + * Read a line of input, but do not echo back to the user what is being typed. This is used mainly when asking for + * things like passwords. + * If the console implementation does not support no-echo input, the input will be + * output as the user typed it. * - * @param mask character to echo back to the user when the user types in the line. * @return the line typed by the user * @throws IOException */ - String readLine(char mask) throws IOException; - + String readLineNoEcho() throws IOException; + /** * Close the reader. * @throws IOException diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java index e3ebe4c..71f0e4f 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -18,19 +18,98 @@ */ package org.rhq.enterprise.agent; +import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; +import mazz.i18n.Logger; + +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + /** * Creates implementations of the input reader depending on the need for a native console library. * * @author John Mazzitelli */ public class AgentInputReaderFactory { - public static AgentInputReader create() throws IOException { - return new JlineAgentInputReader(); + private static final Logger LOG = AgentI18NFactory.getLogger(AgentInputReaderFactory.class); + + public static enum ConsoleType { + java, sigar, jline + } + + private static ConsoleType consoleType = ConsoleType.jline; + + public static AgentInputReader create(AgentMain agent) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(); + break; + case sigar: + input = new SigarAgentInputReader(agent); + break; + case jline: + input = new JLineAgentInputReader(agent); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(); + } + + return input; } - public static AgentInputReader create(FileInputStream fis) throws IOException { - return new JlineAgentInputReader(fis); + + public static AgentInputReader create(AgentMain agent, File file) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(new FileReader(file)); + break; + case sigar: + input = new SigarAgentInputReader(agent, new FileReader(file)); + break; + case jline: + input = new JLineAgentInputReader(agent, new FileInputStream(file)); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(new FileReader(file)); + } + + return input; + } + + public static ConsoleType getConsoleType() { + return consoleType; + } + + public static void setConsoleType(ConsoleType type) { + consoleType = type; + } + + public static void setConsoleType(String typeStr) { + try { + setConsoleType(ConsoleType.valueOf(typeStr)); + } catch (Exception e) { + throw new IllegalArgumentException(LOG.getMsgString( + AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_BAD_TYPE, typeStr)); + } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index aba4eb5..2baf5f5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -89,7 +89,6 @@ import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; import org.rhq.core.util.exception.ThrowableUtil; @@ -152,7 +151,6 @@ import org.rhq.enterprise.communications.command.server.CommandListener; import org.rhq.enterprise.communications.command.server.IncomingCommandTrace; import org.rhq.enterprise.communications.util.CommandTraceUtil; import org.rhq.enterprise.communications.util.SecurityUtil; -import org.rhq.enterprise.communications.util.prefs.PromptInput; /** * The main class of the agent runtime container. @@ -387,12 +385,13 @@ public class AgentMain { if (agent.m_forcedSetup || (!agent.m_daemonMode && !agent.m_configuration.isAgentConfigurationSetup())) { SetupPromptCommand setup_cmd = new SetupPromptCommand(); + AgentPromptInfo in = new AgentPromptInfo(agent); + AgentPrintWriter out = agent.getOut(); + Preferences prefs = agent.m_configuration.getPreferences(); if (agent.m_advancedSetup) { - setup_cmd.performAdvancedSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), - agent.getOut()); + setup_cmd.performAdvancedSetup(prefs, in, out); } else { - setup_cmd.performBasicSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), agent - .getOut()); + setup_cmd.performBasicSetup(prefs, in, out); } } @@ -459,7 +458,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = AgentInputReaderFactory.create(); + m_input = null; m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -477,6 +476,9 @@ public class AgentMain { m_commandLineArgs = args; processArguments(m_commandLineArgs); + if (m_input == null) { + m_input = AgentInputReaderFactory.create(this); + } m_promptCommands = new HashMap<String, Class<? extends AgentPromptCommand>>(); setupPromptCommandsMap(m_promptCommands); @@ -805,32 +807,6 @@ public class AgentMain { } /** - * In some cases, we want to read console input in a native way (that is, using the native system to read the - * keyboard input). This is mainly useful when you want to read in prompt answers which include passwords and you do - * not want to echo what the user typed. - * - * @return object that can be used to read input with the typed data being echoed or not - */ - public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); - } - - /** * Returns the object that can be used to obtain I18N messages from the agent's resource bundle in the user's * locale. * @@ -1097,10 +1073,10 @@ public class AgentMain { // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = AgentInputReaderFactory.create(); + m_input = AgentInputReaderFactory.create(this); } catch (IOException e1) { m_input = null; - } + } m_stdinInput = true; input_string = ""; } else { @@ -2691,12 +2667,13 @@ public class AgentMain { * @throws HelpException if help was requested and the agent should not be created */ private void processArguments(String[] args) throws Exception { - String sopts = "-:hdlasntuD:i:o:c:p:"; + String sopts = "-:hdlasntuD:i:o:c:p:e:"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'), new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), new LongOpt("config", LongOpt.REQUIRED_ARGUMENT, null, 'c'), new LongOpt("pref", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), @@ -2789,6 +2766,11 @@ public class AgentMain { break; } + case 'e': { + AgentInputReaderFactory.setConsoleType(getopt.getOptarg()); + break; + } + case 'd': { m_daemonMode = true; break; @@ -2798,7 +2780,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = AgentInputReaderFactory.create(new FileInputStream(script)); + m_input = AgentInputReaderFactory.create(this, script); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java deleted file mode 100644 index 287421d..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note - * that if the native libraries are not available or have been disabled, this will effectively fallback to using the - * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} - * will do the same as {@link #readLine()}). - * - * @author John Mazzitelli - */ -public class AgentNativePromptInfo implements PromptInput { - private final SystemInfo systemInfo; - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the system info used to obtain the console input - * natively. The agent is provided so it can give us a fallback stream where input can be read in case either <code> - * sysinfo</code> is <code>null</code> or it is not a native implementation (as will be the case if the platform - * where this object is running does not have native libraries for it). - * - * @param sysinfo the object where native console input can be read (may be <code>null</code>) - * @param agent the agent that will be doing the prompting and will provide us with a fallback input stream if - * <code>sysinfo</code> is <code>null</code> or not a native implementation - */ - public AgentNativePromptInfo(SystemInfo sysinfo, AgentMain agent) { - this.systemInfo = sysinfo; - this.agent = agent; - } - - public String readLine() throws IOException { - String input; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - input = systemInfo.readLineFromConsole(false); - } - - return input; - } - - public String readLineNoEcho() throws IOException { - String input = null; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - while (true) { - // get the answer the first time - input = systemInfo.readLineFromConsole(true); - - // get the answer a second time - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - String confirmation = systemInfo.readLineFromConsole(true); - systemInfo.writeLineToConsole("\n"); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - } - } - - return input; - } -} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java new file mode 100644 index 0000000..9984626 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note + * that if the native libraries are not available or have been disabled, this will effectively fallback to using the + * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} + * will do the same as {@link #readLine()}). + * + * @author John Mazzitelli + */ +public class AgentPromptInfo implements PromptInput { + + private final AgentMain agent; + + public AgentPromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLine(); + } else { + throw new IOException("Agent not accepting input"); + } + } + + public String readLineNoEcho() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLineNoEcho(); + } else { + throw new IOException("Agent not accepting input"); + } + } +} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java index 4d691c2..70e8e84 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java @@ -174,7 +174,19 @@ public class AgentUpdateThread extends Thread { if (results.getError() != null) { throw results.getError(); } - tryAgain = false; + + // update has started! if this agent is running in non-daemon mode, kill + // the input stream so the input thread knows to shutdown now + try { + AgentInputReader in = this.agent.getIn(); + if (in != null) { + System.in.close(); // we must ensure we close this directly! + in.close(); + } + } catch (Throwable t) { + } finally { + tryAgain = false; + } } catch (Throwable t) { showErrorMessage(AgentI18NResourceKeys.UPDATE_THREAD_EXCEPTION, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java new file mode 100644 index 0000000..15a3a89 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java @@ -0,0 +1,90 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +import jline.ConsoleReader; + +public class JLineAgentInputReader implements AgentInputReader { + + private final ConsoleReader jline; + private final AgentMain agent; + private final boolean consoleInput; + + public JLineAgentInputReader(AgentMain agent) throws IOException { + this.jline = new ConsoleReader(); + this.agent = agent; + this.consoleInput = true; + } + + public JLineAgentInputReader(AgentMain agent, FileInputStream fis) throws IOException { + this.jline = new ConsoleReader(fis, agent.getOut()); + this.agent = agent; + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.jline.readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time - the '*' is echoed back to the user + input = jline.readLine(Character.valueOf('*')); + + if (!isConsole()) { + break; // not reading input from a console, so we don't ask for confirmation + } + + // get the answer a second time + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + this.agent.getOut().println(); + String confirmation = jline.readLine(Character.valueOf('*')); + this.agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + this.agent.getOut().println(); + } + + return input; + } + + public void close() throws IOException { + InputStream input = jline.getInput(); + if (input != null) { + input.close(); + } + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java new file mode 100644 index 0000000..7003457 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java @@ -0,0 +1,60 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import jline.ConsoleReader; + +public class JavaAgentInputReader implements AgentInputReader { + + private final BufferedReader reader; + private final boolean consoleInput; + + public JavaAgentInputReader() throws IOException { + this.reader = new BufferedReader(new InputStreamReader(System.in)); + this.consoleInput = true; + } + + public JavaAgentInputReader(FileReader fr) throws IOException { + this.reader = new BufferedReader(fr); + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.reader.readLine(); + } + + public String readLineNoEcho() throws IOException { + return this.reader.readLine(); // can't mask the input with this Java API + } + + public void close() throws IOException { + this.reader.close(); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java deleted file mode 100644 index 3de70f4..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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; - -import java.io.FileInputStream; -import java.io.IOException; - -import jline.ConsoleReader; - -public class JlineAgentInputReader implements AgentInputReader { - - private ConsoleReader jline; - - public JlineAgentInputReader() throws IOException { - jline = new ConsoleReader(); - } - - public JlineAgentInputReader(FileInputStream fis) throws IOException { - jline = new ConsoleReader(fis, null); - } - - public String readLine() throws IOException { - return jline.readLine(); - } - - public String readLine(char mask) throws IOException { - return jline.readLine(Character.valueOf(mask)); - } - - public void close() throws IOException { - jline.getInput().close(); - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java new file mode 100644 index 0000000..f3b29ce --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java @@ -0,0 +1,73 @@ +package org.rhq.enterprise.agent; + +import java.io.FileReader; +import java.io.IOException; + +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Uses the SIGAR API when appropriate to read in console input. + * This falls back to the Java-only superclass implementation if + * the native SIGAR API is not available. + * + * @author John Mazzitelli + */ +public class SigarAgentInputReader extends JavaAgentInputReader { + + private final AgentMain agent; + + public SigarAgentInputReader(AgentMain agent) throws IOException { + super(); + this.agent = agent; + } + + public SigarAgentInputReader(AgentMain agent, FileReader fr) throws IOException { + super(fr); + this.agent = agent; + } + + @Override + public String readLine() throws IOException { + String input; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + input = systemInfo.readLineFromConsole(false); + } + + return input; + } + + @Override + public String readLineNoEcho() throws IOException { + String input = null; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + while (true) { + // get the answer the first time + input = systemInfo.readLineFromConsole(true); + + // get the answer a second time + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + String confirmation = systemInfo.readLineFromConsole(true); + systemInfo.writeLineToConsole("\n"); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + } + } + + return input; + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d2aa065..68da9a6 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,6 +28,12 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { + @I18NMessage("Specified bad console type [{0}]") + String AGENT_INPUT_READER_FACTORY_BAD_TYPE = "AgentMain.input-reader-factory-bad-type"; + + @I18NMessage("Failed to create console input reader of type [{0}]") + String AGENT_INPUT_READER_FACTORY_ERROR = "AgentMain.input-reader-factory-error"; + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -549,6 +555,7 @@ public interface AgentI18NResourceKeys { + "\\ -c, --config=<filename> Specifies an agent configuration preferences file (on filesystem or classpath)\\n\\\n" + "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n" + "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n" + + "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n" + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java index 57add17..4c9226a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java @@ -31,6 +31,7 @@ import org.jboss.remoting.security.SSLSocketBuilder; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.AgentPromptInfo; import org.rhq.enterprise.agent.i18n.AgentI18NFactory; import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; import org.rhq.enterprise.agent.i18n.AgentSetupInstructions; @@ -78,11 +79,11 @@ public class SetupPromptCommand implements AgentPromptCommand { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.SETUP_MUST_BE_STOPPED)); } else { if (args.length == 1) { - performBasicSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performBasicSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ADVANCED))) { - performAdvancedSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAdvancedSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ALL))) { - performAllSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAllSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); } commit 1f3d5356a7d1257f86effa4e3f83b604d9bed87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 23:44:13 2010 -0500 start abstracting out the input reader diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java new file mode 100644 index 0000000..dc6644b --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -0,0 +1,54 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.IOException; + +/** + * Abstracts out the console input to allow us to use either a native console or a Java based console. + * + * @author John Mazzitelli + */ +public interface AgentInputReader { + /** + * Reads a line from the input console. + * + * @return the line + * @throws IOException + */ + String readLine() throws IOException; + + /** + * Reads a line from the input console, echoing out the 'mask' character as opposed to the character + * typed by the user. If the console implementation does not support mask echoes, either the + * user-entered character is masked or some other masking is performed in an implementation specific way. + * + * @param mask character to echo back to the user when the user types in the line. + * @return the line typed by the user + * @throws IOException + */ + String readLine(char mask) throws IOException; + + /** + * Close the reader. + * @throws IOException + */ + void close() throws IOException; +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java new file mode 100644 index 0000000..e3ebe4c --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +/** + * Creates implementations of the input reader depending on the need for a native console library. + * + * @author John Mazzitelli + */ +public class AgentInputReaderFactory { + public static AgentInputReader create() throws IOException { + return new JlineAgentInputReader(); + } + public static AgentInputReader create(FileInputStream fis) throws IOException { + return new JlineAgentInputReader(fis); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index d75cb7d..aba4eb5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -21,14 +21,12 @@ package org.rhq.enterprise.agent; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; @@ -58,8 +56,6 @@ import java.util.prefs.Preferences; import javax.management.MBeanServer; import javax.management.ObjectName; -import jline.ConsoleReader; - import mazz.i18n.Logger; import mazz.i18n.Msg; @@ -208,7 +204,7 @@ public class AgentMain { /** * The stream where the commands are input. */ - private ConsoleReader m_input; + private AgentInputReader m_input; /** * Will be <code>true</code> if the input is coming directly from stdin; <code>false</code> if an input script file @@ -463,7 +459,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -804,7 +800,7 @@ public class AgentMain { * * @return the input stream or <code>null</code> if the agent is not currently accepting input */ - public ConsoleReader getIn() { + public AgentInputReader getIn() { return m_input; } @@ -1093,13 +1089,17 @@ public class AgentMain { } } else if (!m_stdinInput) { // if we are processing a script, we hit the EOF, so close the input stream - + try { + m_input.close(); + } catch (IOException e1) { + } // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); } catch (IOException e1) { + m_input = null; } m_stdinInput = true; input_string = ""; @@ -2798,7 +2798,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = new ConsoleReader(new FileInputStream(script), null); + m_input = AgentInputReaderFactory.create(new FileInputStream(script)); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java new file mode 100644 index 0000000..3de70f4 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +import jline.ConsoleReader; + +public class JlineAgentInputReader implements AgentInputReader { + + private ConsoleReader jline; + + public JlineAgentInputReader() throws IOException { + jline = new ConsoleReader(); + } + + public JlineAgentInputReader(FileInputStream fis) throws IOException { + jline = new ConsoleReader(fis, null); + } + + public String readLine() throws IOException { + return jline.readLine(); + } + + public String readLine(char mask) throws IOException { + return jline.readLine(Character.valueOf(mask)); + } + + public void close() throws IOException { + jline.getInput().close(); + } +} commit bd631f0dda01d2f6e594fe1c1f2df92155f4c893 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Feb 2 22:55:14 2010 -0500 fix eclipse settings so that code gets auto-reformatted on save diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 10d36a9..e7120a1 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Jan 14 12:59:22 EST 2010 +#Tue Feb 02 22:50:09 EST 2010 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true cleanup_profile=_RHQ cleanup_settings_version=2 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_RHQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e commit 95511f633370a76ab42b2b4b8eabe4259fff3903 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:36 2010 -0500 put this back in the agent diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 10a1c32a5aee2174b29a02eb70cf3a05b9a1f724 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:20 2010 -0500 opps. this should not be here diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} commit 86270a451083b341baa3710355c9ae4c02292a89 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:14:33 2010 -0500 put this back, but don't integrate it yet diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 80bf4075b6d4c3a84e1b9c788730faa191769657 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:26:27 2010 -0500 fixing .classpath (again) diff --git a/.classpath b/.classpath index 9658f94..3b948dd 100644 --- a/.classpath +++ b/.classpath @@ -112,7 +112,6 @@ <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/virt/src/test/java"/> <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> commit 1b160377f367eda9254a2bf73d1ec0ec89e5b85c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:09:57 2010 -0500 why does antlr-config keep showing up in .classpath? diff --git a/.classpath b/.classpath index ae63f80..9658f94 100644 --- a/.classpath +++ b/.classpath @@ -121,7 +121,6 @@ <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/antlr-config/src/main/antlr3"/> <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/> commit d79827427eaac98f481b5869718e09efd08782f1 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 12:54:16 2010 -0500 BZ 561083 - output warnings if server or agent endpoints use loopback diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 0d900d4..d75cb7d 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -1276,6 +1276,7 @@ public class AgentMain { boolean got_registered = false; int registrationFailures = 0; final int MAX_ALLOWED_REGISTRATION_FAILURES = 5; + boolean hide_loopback_warning = Boolean.getBoolean("rhq.hide-agent-localhost-warning"); while (retry) { try { @@ -1305,8 +1306,14 @@ public class AgentMain { if (sender.isSending()) { LOG.debug(AgentI18NResourceKeys.AGENT_REGISTRATION_ATTEMPT, request); - if (remote_endpoint.contains("127.0.0.1") || remote_endpoint.contains("localhost")) { - LOG.warn(AgentI18NResourceKeys.REGISTERING_WITH_LOOPBACK, remote_endpoint); + if (!hide_loopback_warning) { + if (remote_endpoint.contains("localhost") || remote_endpoint.contains("127.0.0.1")) { + String msg_id = AgentI18NResourceKeys.REGISTERING_WITH_LOOPBACK; + LOG.warn(msg_id, remote_endpoint); + getOut().println(MSG.getMsg(msg_id, remote_endpoint)); + getOut().println(); + hide_loopback_warning = true; // don't bother to tell the user more than once + } } // delete any old token so request is unauthenticated to get server to accept it @@ -2499,6 +2506,25 @@ public class AgentMain { LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile, ThrowableUtil .getAllMessages(e)); } + + // let's be kind to the user - if any server address is "localhost" or "127.0.0.1" + // or starts with "localhost." (such as localhost.localdomain) then we should output a + // warning to let the user know that that probably isn't what they want. + // In cases when someone is demo'ing/testing/developing, and they don't want to see this, provide + // a way for them to turn off this warning - it could get annoying since it will show up everytime + // the primary switchover thread triggers and needs to persist the list as well as during initial startup/registration. + if (!Boolean.getBoolean("rhq.hide-server-localhost-warning")) { + int numServers = failoverList.size(); + for (int i = 0; i < numServers; i++) { + ServerEntry server = failoverList.get(i); + String addr = (server.address != null) ? server.address : ""; + if ("localhost".equals(addr) || "127.0.0.1".equals(addr) || addr.startsWith("localhost.")) { + LOG.warn(AgentI18NResourceKeys.FAILOVER_LIST_HAS_LOCALHOST, server.address); + getOut().println(MSG.getMsg(AgentI18NResourceKeys.FAILOVER_LIST_HAS_LOCALHOST, server.address)); + break; // just show the warning once + } + } + } } return; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index 7de47a3..d2aa065 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,7 +28,7 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { - @I18NMessage("This agent is registering under the loopback address [{0}] - this should only be done for testing " + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -200,6 +200,12 @@ public interface AgentI18NResourceKeys { @I18NMessage("Too many failover attempts have been made [{0}]. Exception that triggered the failover: [{1}]") String TOO_MANY_FAILOVER_ATTEMPTS = "AgentMain.too-many-failover-attempts"; + @I18NMessage("!!! A server has registered under a loopback address [{0}] - this should only be done for testing and demo purposes. " + + "Only agents running on the same machine as that server will be able to interact with that server successfully. " + + "Please double check that you really want your server to have a public endpoint of [{0}]. " + + "See the Administration > High Availability > Servers menu in the server GUI to change the public endpoint of the server.") + String FAILOVER_LIST_HAS_LOCALHOST = "AgentMain.failover-list-has-localhost"; + @I18NMessage("The server failover list has been loaded from [{0}] - there are [{1}] servers in the list") String FAILOVER_LIST_LOADED = "AgentMain.failover-list-loaded"; commit dcc7af90ef24779dc31919b26c5fab2bced916fe Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:50:50 2010 -0500 Disabled multicast test until we work out its issues with the hudson server. Filed as BZ 561069 to investigate the hudson configuration issues. diff --git a/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java b/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java index 2837893..ba3028b 100644 --- a/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java +++ b/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java @@ -294,8 +294,14 @@ public class AgentComm4Test extends AgentCommTestBase { * * @throws Exception */ - @Test(enabled = ENABLE_TESTS) + @Test(enabled = false) public void testAutoDiscovery() throws Exception { + + /* Disabled until we work out the issues of running multicast on the hudson server. + + jdobies, Feb 2, 2010 + */ + Properties props1 = new Properties(); props1.setProperty(AgentConfigurationConstants.SERVER_AUTO_DETECTION, "true"); props1.setProperty(AgentConfigurationConstants.CLIENT_SENDER_SERVER_POLLING_INTERVAL, "-1"); commit 28d2d117fe778aad83334a1f14059443d4b1cb8d Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:18:58 2010 -0500 Fixed broken test on recommendation from mazz. diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java index d921934..cdd86fd 100644 --- a/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java @@ -117,7 +117,7 @@ public class JavaTest { */ public void testConcurrency() throws Exception { final SystemInfo sysinfo = SystemInfoFactory.createJavaSystemInfo(); - final int hostname = sysinfo.getHostname().hashCode(); +// final int hostname = sysinfo.getHostname().hashCode(); final int osname = sysinfo.getOperatingSystemName().hashCode(); final int osver = sysinfo.getOperatingSystemVersion().hashCode(); final List<Throwable> errors = new Vector<Throwable>(); @@ -128,7 +128,7 @@ public class JavaTest { try { count.incrementAndGet(); - assert sysinfo.getHostname().hashCode() == hostname; +// assert sysinfo.getHostname().hashCode() == hostname; assert sysinfo.getOperatingSystemName().hashCode() == osname; assert sysinfo.getOperatingSystemVersion().hashCode() == osver; } catch (Throwable t) { commit ef718853fc7e1978f01081928a8b69ce67dc5ca2 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:00:51 2010 -0500 Revert "Fix the native cleanup so that it will not echo password and will use jline" This reverts commit d19bacd67e857e52428144ab28af5a0c44956df3. Conflicts: modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index e2c6440..0d900d4 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -816,7 +816,22 @@ public class AgentMain { * @return object that can be used to read input with the typed data being echoed or not */ public PromptInput getNativeIn() { - return new JlinePromptInfo(this) ; + SystemInfo sysinfo = null; + + // if we are not in daemon mode, we are running in a console and thus we can try to use + // the native library to get its input. + // If we are in daemon mode, we aren't running in a console so we need to pass null + // in for sysinfo thus causing the prompt info implementation to use our fallback buffered + // reader (which is either empty or is contents of an input file that was piped in via --input. + if (!m_daemonMode) { + // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), + // be able to configure the agent to ignore the native console + if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { + sysinfo = SystemInfoFactory.createSystemInfo(); + } + } + + return new AgentNativePromptInfo(sysinfo, this); } /** diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java index b1cc009..287421d 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java @@ -30,9 +30,7 @@ import org.rhq.enterprise.communications.util.prefs.PromptInput; * will do the same as {@link #readLine()}). * * @author John Mazzitelli - * @deprecated */ -@Deprecated public class AgentNativePromptInfo implements PromptInput { private final SystemInfo systemInfo; private final AgentMain agent; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index cb09997..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)) ; - agent.getOut().println() ; - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println() ; - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println() ; - } - - return input; - } -} \ No newline at end of file commit 2317d8964ea1ee67f80b504ffb5ebe628ceffa7c Author: John Sanda <jsanda(a)redhat.com> Date: Tue Feb 2 08:07:00 2010 -0500 Removing raw-config-test module from plugins build as it is just for testing diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index a0d4924..bd2cc00 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -124,9 +124,6 @@ <module>virt</module> <module>kickstart</module> -  - <module>raw-config-test</module> -  <module>validate-all-plugins</module> </modules> commit d9a314f52216f3b6b95f9b411ada8c9affd92d6f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Feb 1 16:50:34 2010 -0500 reverting change. will have to find another way or add some more changes as setting scop provided on the domain jar causes issues in the jboss-software plugin build and maybe others. diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 9d2ab8a..ffae346 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -30,7 +30,6 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> - <scope>provided</scope>  </dependency> <dependency> commit 11c2a841f3fe5b5f92e2d9ad527fa1e958ef76b3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Feb 1 15:57:55 2010 -0500 Set the rhq-core-domain dependency to provided scope to prevent it from being packaged in the rhq.ear lib as an inherited dependency. diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index ffae346..9d2ab8a 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -30,6 +30,7 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> + <scope>provided</scope>  </dependency> <dependency> commit 38af755136bfe38028d1757aca35b017e4cf9be6 Merge: 06c290f... 2e7221e... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Feb 1 15:56:51 2010 -0500 Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Conflicts: modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml commit 06c290f53080d40885e17adb7b9e2ced2fe7d94a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Feb 1 15:55:58 2010 -0500 Git forced this commit. No known changes. diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index adc6f0e..ac9bad1 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -1,424 +1,424 @@ -/* -* Jopr Management Platform -* Copyright (C) 2005-2009 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.plugins.jbossas5; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.maven.artifact.versioning.ComparableVersion; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertyList; -import org.rhq.core.domain.configuration.PropertyMap; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; -import org.rhq.core.pluginapi.inventory.ClassLoaderFacet; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; -import org.rhq.core.pluginapi.inventory.ProcessScanResult; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.inventory.ManualAddFacet; -import org.rhq.core.pluginapi.util.FileUtils; -import org.rhq.core.system.ProcessInfo; -import org.rhq.plugins.jbossas5.helper.JBossInstallationInfo; -import org.rhq.plugins.jbossas5.helper.JBossInstanceInfo; -import org.rhq.plugins.jbossas5.helper.JBossProperties; -import org.rhq.plugins.jbossas5.helper.JBossProductType; -import org.rhq.plugins.jbossas5.util.JnpConfig; - -import org.jboss.on.common.jbossas.JBossASDiscoveryUtils; - -/** - * A Resource discovery component for JBoss AS, 5.2.0.Beta1 or later, and JBoss EAP and SOA-P, 5.0.0.Beta or later, - * Servers. - * - * @author Ian Springer - * @author Mark Spritzler - */ -public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryComponent, ClassLoaderFacet, - ManualAddFacet { - private static final String CHANGE_ME = "***CHANGE_ME***"; - private static final String JBOSS_SERVICE_XML = "conf" + File.separator + "jboss-service.xml"; - private static final String JBOSS_NAMING_SERVICE_XML = "deploy" + File.separator + "naming-service.xml"; - private static final String ANY_ADDRESS = "0.0.0.0"; - private static final String LOCALHOST = "127.0.0.1"; - private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME"; - - private static final Map<JBossProductType, ComparableVersion> MINIMUM_PRODUCT_VERSIONS = new HashMap(3); - static { - MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1")); - MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta")); - MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta")); - } - - private static final String[] CLIENT_JARS = new String[] { - "client/jbossall-client.jar", - "common/lib/jboss-security-aspects.jar", - "lib/jboss-managed.jar", - "lib/jboss-metatype.jar", - "lib/jboss-dependency.jar" - }; - - private final Log log = LogFactory.getLog(this.getClass()); - - public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) { - log.trace("Discovering JBoss AS 5.x and 6.x Resources..."); - Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); - DiscoveredResourceDetails inProcessJBossAS = discoverInProcessJBossAS(discoveryContext); - if (inProcessJBossAS != null) { - // If we're running inside a JBoss AS JVM, that's the only AS instance we want to discover. - resources.add(inProcessJBossAS); - } else { - // Otherwise, scan the process table for external AS instances. - resources.addAll(discoverExternalJBossAsProcesses(discoveryContext)); - } - log.trace("Discovered " + resources.size() + " JBossAS 5.x and 6.x Resources."); - return resources; - } - - public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, - ResourceDiscoveryContext discoveryContext) - throws InvalidPluginConfigurationException { - // Set default values on any props that are not set. - //setPluginConfigurationDefaults(pluginConfiguration); - - ProcessInfo processInfo = null; - String jbossHomeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR) - .getStringValue(); - JBossInstallationInfo installInfo; - try { - installInfo = new JBossInstallationInfo(new File(jbossHomeDir)); - } catch (IOException e) { - throw new InvalidPluginConfigurationException(e); - } - DiscoveredResourceDetails resourceDetails = createResourceDetails(discoveryContext, pluginConfig, processInfo, - installInfo); - return resourceDetails; - } - - @SuppressWarnings("unchecked") - public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext context, DiscoveredResourceDetails details) - throws Exception { - Configuration pluginConfig = details.getPluginConfiguration(); - String homeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR).getStringValue(); - - List<URL> clientJars = new ArrayList<URL>(); - - for (String jarFileName : CLIENT_JARS) { - File clientJar = new File(homeDir, jarFileName); - if (!clientJar.exists()) { - throw new FileNotFoundException("Cannot find [" + clientJar + "] - unable to manage server."); - } - if (!clientJar.canRead()) { - throw new IOException("Cannot read [" + clientJar + "] - unable to manage server."); - } - clientJars.add(clientJar.toURI().toURL()); - } - - return clientJars; - } - - private Set<DiscoveredResourceDetails> discoverExternalJBossAsProcesses(ResourceDiscoveryContext discoveryContext) { - Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); - List<ProcessScanResult> autoDiscoveryResults = discoveryContext.getAutoDiscoveredProcesses(); - - for (ProcessScanResult autoDiscoveryResult : autoDiscoveryResults) { - ProcessInfo processInfo = autoDiscoveryResult.getProcessInfo(); - if (log.isDebugEnabled()) - log.debug("Discovered JBoss AS process: " + processInfo); - - JBossInstanceInfo cmdLine; - try { - cmdLine = new JBossInstanceInfo(processInfo); - } catch (Exception e) { - log.error("Failed to process JBoss AS command line: " + Arrays.asList(processInfo.getCommandLine()), e); - continue; - } - - // Skip it if it's an AS/EAP/SOA-P version we don't support. - JBossInstallationInfo installInfo = cmdLine.getInstallInfo(); - if (!isSupportedProduct(installInfo)) { - continue; - } - - File installHome = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.HOME_DIR)); - File configDir = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_HOME_DIR)); - - // The config dir might be a symlink - call getCanonicalFile() to resolve it if so, before - // calling isDirectory() (isDirectory() returns false for a symlink, even if it points at - // a directory). - try { - if (!configDir.getCanonicalFile().isDirectory()) { - log.warn("Skipping discovery for JBoss AS process " + processInfo + ", because configuration dir '" - + configDir + "' does not exist or is not a directory."); - continue; - } - } catch (IOException e) { - log.error("Skipping discovery for JBoss AS process " + processInfo + ", because configuration dir '" - + configDir + "' could not be canonicalized.", e); - continue; - } - - Configuration pluginConfiguration = discoveryContext.getDefaultPluginConfiguration(); - - String jnpURL = getJnpURL(cmdLine, installHome, configDir); - - // TODO? Set the connection type - local or remote - - // Set the required props... - pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.NAMING_URL, - jnpURL)); - pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.HOME_DIR, - installHome.getAbsolutePath())); - pluginConfiguration.put(new PropertySimple( - ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR, configDir)); - - // Set the optional props... - pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.SERVER_NAME, - cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_NAME))); - pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.BIND_ADDRESS, - cmdLine.getSystemProperties().getProperty(JBossProperties.BIND_ADDRESS))); - - JBossASDiscoveryUtils.UserInfo userInfo = JBossASDiscoveryUtils.getJmxInvokerUserInfo(configDir); - if (userInfo != null) { - pluginConfiguration.put( - new PropertySimple(ApplicationServerPluginConfigurationProperties.PRINCIPAL, - userInfo.getUsername())); - pluginConfiguration.put( - new PropertySimple(ApplicationServerPluginConfigurationProperties.CREDENTIALS, - userInfo.getPassword())); - } - - String javaHome = processInfo.getEnvironmentVariable(JAVA_HOME_ENV_VAR); - if (javaHome == null && log.isDebugEnabled()) { - log.debug("JAVA_HOME environment variable not set in JBoss AS process - defaulting " - + ApplicationServerPluginConfigurationProperties.JAVA_HOME - + " connection property to the plugin container JRE dir."); - javaHome = System.getenv(JAVA_HOME_ENV_VAR); - } - - pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.JAVA_HOME, - javaHome)); - - initLogEventSourcesConfigProp(configDir, pluginConfiguration); - - // TODO: Init props that have static defaults. - //setPluginConfigurationDefaults(pluginConfiguration); - - DiscoveredResourceDetails resourceDetails = createResourceDetails(discoveryContext, pluginConfiguration, - processInfo, installInfo); - resources.add(resourceDetails); - } - return resources; - } - - @Nullable - private DiscoveredResourceDetails discoverInProcessJBossAS(ResourceDiscoveryContext discoveryContext) { - try { - return new InProcessJBossASDiscovery().discoverInProcessJBossAS(discoveryContext); - } catch (Throwable t) { - log.debug("In-process JBoss AS discovery failed - we are probably not running embedded within JBoss AS.", t); - return null; - } - } - - private DiscoveredResourceDetails createResourceDetails(ResourceDiscoveryContext discoveryContext, - Configuration pluginConfig, @Nullable ProcessInfo processInfo, JBossInstallationInfo installInfo) { - String serverHomeDir = pluginConfig.getSimple( - ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR).getStringValue(); - File absoluteConfigPath = resolvePathRelativeToHomeDir(pluginConfig, serverHomeDir); - - // Canonicalize the config path, so it's consistent no matter how it's entered. - // This prevents two servers with different forms of the same config path, but - // that are actually the same server, from ending up in inventory. - // JON: fix for JBNADM-2634 - do not resolve symlinks (ips, 12/18/07) - String key = FileUtils.getCanonicalPath(absoluteConfigPath.getPath()); - - String bindAddress = pluginConfig.getSimple( - ApplicationServerPluginConfigurationProperties.BIND_ADDRESS).getStringValue(); - String namingUrl = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.NAMING_URL) - .getStringValue(); - - // Only include the JNP port in the Resource name if its value is not "***CHANGE_ME***". - String namingPort = null; - //noinspection ConstantConditions - int colonIndex = namingUrl.lastIndexOf(':'); - if ((colonIndex != -1) && (colonIndex != (namingUrl.length() - 1))) { - // NOTE: We assume the JNP URL does not have a trailing slash. - String port = namingUrl.substring(colonIndex + 1); - if (!port.equals(CHANGE_ME)) - namingPort = port; - } - - String configName = absoluteConfigPath.getName(); - String baseName = discoveryContext.getSystemInformation().getHostname(); - String description = installInfo.getProductType().DESCRIPTION; - File deployDir = new File(absoluteConfigPath, "deploy"); - File rhqInstallerWar = new File(deployDir, "rhq-installer.war"); - File rhqInstallerWarUndeployed = new File(deployDir, "rhq-installer.war.rej"); - boolean isRhqServer = rhqInstallerWar.exists() || rhqInstallerWarUndeployed.exists(); - if (isRhqServer) { - baseName += " RHQ Server, "; - description += " hosting the RHQ Server"; - // We know this is an RHQ Server. Let's add an event source for its server log file, but disable it by default. - configureEventSourceForServerLogFile(pluginConfig); - } - String name = formatServerName(baseName, bindAddress, namingPort, configName, installInfo); - - return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(), - description, pluginConfig, processInfo); - } - - private String formatServerName(String baseName, String bindingAddress, String jnpPort, String configName, - JBossInstallationInfo installInfo) { - baseName = baseName + " " + installInfo.getProductType().NAME + " " + installInfo.getVersion() + " " - + configName; - String details = null; - if ((bindingAddress != null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) { - details = bindingAddress + ":" + jnpPort; - } else if ((bindingAddress == null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) { - details = jnpPort; - } else if (bindingAddress != null) { - details = bindingAddress; - } - - return baseName + ((details != null) ? (" (" + details + ")") : ""); - } - - private void configureEventSourceForServerLogFile(Configuration pluginConfig) { - File rhqLogFile = resolvePathRelativeToHomeDir(pluginConfig, "../logs/rhq-server-log4j.log"); - if (rhqLogFile.exists() && !rhqLogFile.isDirectory()) { - try { - PropertyMap serverLogEventSource = new PropertyMap("serverLog"); - serverLogEventSource.put(new PropertySimple( - LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.LOG_FILE_PATH, rhqLogFile - .getCanonicalPath())); - serverLogEventSource.put(new PropertySimple( - LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.ENABLED, Boolean.FALSE)); - serverLogEventSource.put(new PropertySimple( - LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.MINIMUM_SEVERITY, "info")); - PropertyList logEventSources = pluginConfig - .getList(LogFileEventResourceComponentHelper.LOG_EVENT_SOURCES_CONFIG_PROP); - logEventSources.add(serverLogEventSource); - } catch (IOException e) { - log.warn("Unable to setup RHQ Server log file monitoring.", e); - } - } - } - - private String getJnpURL(JBossInstanceInfo cmdLine, File installHome, File configDir) { - File jnpServiceUrlFile = new File(configDir, "data/jnp-service.url"); - if (jnpServiceUrlFile.exists() && jnpServiceUrlFile.canRead()) { - try { - BufferedReader br = new BufferedReader(new FileReader(jnpServiceUrlFile)); - String jnpUrl = br.readLine(); - if (jnpUrl != null) { - if (log.isDebugEnabled()) { - log.debug("Read JNP URL from jnp-service.url file: " + jnpUrl); - } - return jnpUrl; - } - } catch (IOException ioe) { - // Nothing to do - } - } - - log.warn("Failed to read JNP URL from '" + jnpServiceUrlFile + "'."); - - // Above did not work, so fall back to our previous scheme - JnpConfig jnpConfig = getJnpConfig(installHome, configDir, cmdLine.getSystemProperties()); - String jnpAddress = (jnpConfig.getJnpAddress() != null) ? jnpConfig.getJnpAddress() : CHANGE_ME; - if (ANY_ADDRESS.equals(jnpAddress)) { - jnpAddress = LOCALHOST; - } - String jnpPort = (jnpConfig.getJnpPort() != null) ? String.valueOf(jnpConfig.getJnpPort()) : CHANGE_ME; - return "jnp://" + jnpAddress + ":" + jnpPort; - } - - private static JnpConfig getJnpConfig(File installHome, File configDir, Properties props) { - File serviceXML = new File(configDir, JBOSS_SERVICE_XML); - JnpConfig config = JnpConfig.getConfig(installHome, serviceXML, props); - if ((config == null) || (config.getJnpPort() == null)) { - File namingServiceFile = new File(configDir, JBOSS_NAMING_SERVICE_XML); - if (namingServiceFile.exists()) { - config = JnpConfig.getConfig(installHome, namingServiceFile, props); - } - } - return config; - } - - private void initLogEventSourcesConfigProp(File configDir, Configuration pluginConfig) { - File logDir = new File(configDir, "log"); - File serverLogFile = new File(logDir, "server.log"); - if (serverLogFile.exists() && !serverLogFile.isDirectory()) { - PropertyMap serverLogEventSource = new PropertyMap("serverLog"); - serverLogEventSource.put(new PropertySimple( - LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.LOG_FILE_PATH, serverLogFile)); - serverLogEventSource.put(new PropertySimple( - LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.ENABLED, Boolean.FALSE)); - PropertyList logEventSources = pluginConfig - .getList(LogFileEventResourceComponentHelper.LOG_EVENT_SOURCES_CONFIG_PROP); - logEventSources.add(serverLogEventSource); - } - } - - private boolean isSupportedProduct(JBossInstallationInfo installInfo) { - ComparableVersion version = new ComparableVersion(installInfo.getVersion()); - JBossProductType productType = installInfo.getProductType(); - ComparableVersion minimumVersion = MINIMUM_PRODUCT_VERSIONS.get(productType); - // The product is supported if the version is greater than or equal to the minimum version. - boolean supported = (version.compareTo(minimumVersion) >= 0); - if (!supported) { - log.debug(productType + " version " + version + " is not supported by this plugin (minimum " + productType - + " version is " + minimumVersion + ") - skipping..."); - } - return supported; - } - - @NotNull - private static File resolvePathRelativeToHomeDir(Configuration pluginConfig, @NotNull String path) { - File configDir = new File(path); - if (!configDir.isAbsolute()) { - String homeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR).getStringValue(); - configDir = new File(homeDir, path); - } - return configDir; - } -} +/* +* Jopr Management Platform +* Copyright (C) 2005-2009 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.plugins.jbossas5; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.maven.artifact.versioning.ComparableVersion; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; +import org.rhq.core.pluginapi.inventory.ClassLoaderFacet; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.inventory.ManualAddFacet; +import org.rhq.core.pluginapi.util.FileUtils; +import org.rhq.core.system.ProcessInfo; +import org.rhq.plugins.jbossas5.helper.JBossInstallationInfo; +import org.rhq.plugins.jbossas5.helper.JBossInstanceInfo; +import org.rhq.plugins.jbossas5.helper.JBossProperties; +import org.rhq.plugins.jbossas5.helper.JBossProductType; +import org.rhq.plugins.jbossas5.util.JnpConfig; + +import org.jboss.on.common.jbossas.JBossASDiscoveryUtils; + +/** + * A Resource discovery component for JBoss AS, 5.2.0.Beta1 or later, and JBoss EAP and SOA-P, 5.0.0.Beta or later, + * Servers. + * + * @author Ian Springer + * @author Mark Spritzler + */ +public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryComponent, ClassLoaderFacet, + ManualAddFacet { + private static final String CHANGE_ME = "***CHANGE_ME***"; + private static final String JBOSS_SERVICE_XML = "conf" + File.separator + "jboss-service.xml"; + private static final String JBOSS_NAMING_SERVICE_XML = "deploy" + File.separator + "naming-service.xml"; + private static final String ANY_ADDRESS = "0.0.0.0"; + private static final String LOCALHOST = "127.0.0.1"; + private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME"; + + private static final Map<JBossProductType, ComparableVersion> MINIMUM_PRODUCT_VERSIONS = new HashMap(3); + static { + MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1")); + MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta")); + MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta")); + } + + private static final String[] CLIENT_JARS = new String[] { + "client/jbossall-client.jar", + "common/lib/jboss-security-aspects.jar", + "lib/jboss-managed.jar", + "lib/jboss-metatype.jar", + "lib/jboss-dependency.jar" + }; + + private final Log log = LogFactory.getLog(this.getClass()); + + public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) { + log.trace("Discovering JBoss AS 5.x and 6.x Resources..."); + Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); + DiscoveredResourceDetails inProcessJBossAS = discoverInProcessJBossAS(discoveryContext); + if (inProcessJBossAS != null) { + // If we're running inside a JBoss AS JVM, that's the only AS instance we want to discover. + resources.add(inProcessJBossAS); + } else { + // Otherwise, scan the process table for external AS instances. + resources.addAll(discoverExternalJBossAsProcesses(discoveryContext)); + } + log.trace("Discovered " + resources.size() + " JBossAS 5.x and 6.x Resources."); + return resources; + } + + public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, + ResourceDiscoveryContext discoveryContext) + throws InvalidPluginConfigurationException { + // Set default values on any props that are not set. + //setPluginConfigurationDefaults(pluginConfiguration); + + ProcessInfo processInfo = null; + String jbossHomeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR) + .getStringValue(); + JBossInstallationInfo installInfo; + try { + installInfo = new JBossInstallationInfo(new File(jbossHomeDir)); + } catch (IOException e) { + throw new InvalidPluginConfigurationException(e); + } + DiscoveredResourceDetails resourceDetails = createResourceDetails(discoveryContext, pluginConfig, processInfo, + installInfo); + return resourceDetails; + } + + @SuppressWarnings("unchecked") + public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext context, DiscoveredResourceDetails details) + throws Exception { + Configuration pluginConfig = details.getPluginConfiguration(); + String homeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR).getStringValue(); + + List<URL> clientJars = new ArrayList<URL>(); + + for (String jarFileName : CLIENT_JARS) { + File clientJar = new File(homeDir, jarFileName); + if (!clientJar.exists()) { + throw new FileNotFoundException("Cannot find [" + clientJar + "] - unable to manage server."); + } + if (!clientJar.canRead()) { + throw new IOException("Cannot read [" + clientJar + "] - unable to manage server."); + } + clientJars.add(clientJar.toURI().toURL()); + } + + return clientJars; + } + + private Set<DiscoveredResourceDetails> discoverExternalJBossAsProcesses(ResourceDiscoveryContext discoveryContext) { + Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); + List<ProcessScanResult> autoDiscoveryResults = discoveryContext.getAutoDiscoveredProcesses(); + + for (ProcessScanResult autoDiscoveryResult : autoDiscoveryResults) { + ProcessInfo processInfo = autoDiscoveryResult.getProcessInfo(); + if (log.isDebugEnabled()) + log.debug("Discovered JBoss AS process: " + processInfo); + + JBossInstanceInfo cmdLine; + try { + cmdLine = new JBossInstanceInfo(processInfo); + } catch (Exception e) { + log.error("Failed to process JBoss AS command line: " + Arrays.asList(processInfo.getCommandLine()), e); + continue; + } + + // Skip it if it's an AS/EAP/SOA-P version we don't support. + JBossInstallationInfo installInfo = cmdLine.getInstallInfo(); + if (!isSupportedProduct(installInfo)) { + continue; + } + + File installHome = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.HOME_DIR)); + File configDir = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_HOME_DIR)); + + // The config dir might be a symlink - call getCanonicalFile() to resolve it if so, before + // calling isDirectory() (isDirectory() returns false for a symlink, even if it points at + // a directory). + try { + if (!configDir.getCanonicalFile().isDirectory()) { + log.warn("Skipping discovery for JBoss AS process " + processInfo + ", because configuration dir '" + + configDir + "' does not exist or is not a directory."); + continue; + } + } catch (IOException e) { + log.error("Skipping discovery for JBoss AS process " + processInfo + ", because configuration dir '" + + configDir + "' could not be canonicalized.", e); + continue; + } + + Configuration pluginConfiguration = discoveryContext.getDefaultPluginConfiguration(); + + String jnpURL = getJnpURL(cmdLine, installHome, configDir); + + // TODO? Set the connection type - local or remote + + // Set the required props... + pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.NAMING_URL, + jnpURL)); + pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.HOME_DIR, + installHome.getAbsolutePath())); + pluginConfiguration.put(new PropertySimple( + ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR, configDir)); + + // Set the optional props... + pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.SERVER_NAME, + cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_NAME))); + pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.BIND_ADDRESS, + cmdLine.getSystemProperties().getProperty(JBossProperties.BIND_ADDRESS))); + + JBossASDiscoveryUtils.UserInfo userInfo = JBossASDiscoveryUtils.getJmxInvokerUserInfo(configDir); + if (userInfo != null) { + pluginConfiguration.put( + new PropertySimple(ApplicationServerPluginConfigurationProperties.PRINCIPAL, + userInfo.getUsername())); + pluginConfiguration.put( + new PropertySimple(ApplicationServerPluginConfigurationProperties.CREDENTIALS, + userInfo.getPassword())); + } + + String javaHome = processInfo.getEnvironmentVariable(JAVA_HOME_ENV_VAR); + if (javaHome == null && log.isDebugEnabled()) { + log.debug("JAVA_HOME environment variable not set in JBoss AS process - defaulting " + + ApplicationServerPluginConfigurationProperties.JAVA_HOME + + " connection property to the plugin container JRE dir."); + javaHome = System.getenv(JAVA_HOME_ENV_VAR); + } + + pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.JAVA_HOME, + javaHome)); + + initLogEventSourcesConfigProp(configDir, pluginConfiguration); + + // TODO: Init props that have static defaults. + //setPluginConfigurationDefaults(pluginConfiguration); + + DiscoveredResourceDetails resourceDetails = createResourceDetails(discoveryContext, pluginConfiguration, + processInfo, installInfo); + resources.add(resourceDetails); + } + return resources; + } + + @Nullable + private DiscoveredResourceDetails discoverInProcessJBossAS(ResourceDiscoveryContext discoveryContext) { + try { + return new InProcessJBossASDiscovery().discoverInProcessJBossAS(discoveryContext); + } catch (Throwable t) { + log.debug("In-process JBoss AS discovery failed - we are probably not running embedded within JBoss AS.", t); + return null; + } + } + + private DiscoveredResourceDetails createResourceDetails(ResourceDiscoveryContext discoveryContext, + Configuration pluginConfig, @Nullable ProcessInfo processInfo, JBossInstallationInfo installInfo) { + String serverHomeDir = pluginConfig.getSimple( + ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR).getStringValue(); + File absoluteConfigPath = resolvePathRelativeToHomeDir(pluginConfig, serverHomeDir); + + // Canonicalize the config path, so it's consistent no matter how it's entered. + // This prevents two servers with different forms of the same config path, but + // that are actually the same server, from ending up in inventory. + // JON: fix for JBNADM-2634 - do not resolve symlinks (ips, 12/18/07) + String key = FileUtils.getCanonicalPath(absoluteConfigPath.getPath()); + + String bindAddress = pluginConfig.getSimple( + ApplicationServerPluginConfigurationProperties.BIND_ADDRESS).getStringValue(); + String namingUrl = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.NAMING_URL) + .getStringValue(); + + // Only include the JNP port in the Resource name if its value is not "***CHANGE_ME***". + String namingPort = null; + //noinspection ConstantConditions + int colonIndex = namingUrl.lastIndexOf(':'); + if ((colonIndex != -1) && (colonIndex != (namingUrl.length() - 1))) { + // NOTE: We assume the JNP URL does not have a trailing slash. + String port = namingUrl.substring(colonIndex + 1); + if (!port.equals(CHANGE_ME)) + namingPort = port; + } + + String configName = absoluteConfigPath.getName(); + String baseName = discoveryContext.getSystemInformation().getHostname(); + String description = installInfo.getProductType().DESCRIPTION; + File deployDir = new File(absoluteConfigPath, "deploy"); + File rhqInstallerWar = new File(deployDir, "rhq-installer.war"); + File rhqInstallerWarUndeployed = new File(deployDir, "rhq-installer.war.rej"); + boolean isRhqServer = rhqInstallerWar.exists() || rhqInstallerWarUndeployed.exists(); + if (isRhqServer) { + baseName += " RHQ Server, "; + description += " hosting the RHQ Server"; + // We know this is an RHQ Server. Let's add an event source for its server log file, but disable it by default. + configureEventSourceForServerLogFile(pluginConfig); + } + String name = formatServerName(baseName, bindAddress, namingPort, configName, installInfo); + + return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(), + description, pluginConfig, processInfo); + } + + private String formatServerName(String baseName, String bindingAddress, String jnpPort, String configName, + JBossInstallationInfo installInfo) { + baseName = baseName + " " + installInfo.getProductType().NAME + " " + installInfo.getVersion() + " " + + configName; + String details = null; + if ((bindingAddress != null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) { + details = bindingAddress + ":" + jnpPort; + } else if ((bindingAddress == null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) { + details = jnpPort; + } else if (bindingAddress != null) { + details = bindingAddress; + } + + return baseName + ((details != null) ? (" (" + details + ")") : ""); + } + + private void configureEventSourceForServerLogFile(Configuration pluginConfig) { + File rhqLogFile = resolvePathRelativeToHomeDir(pluginConfig, "../logs/rhq-server-log4j.log"); + if (rhqLogFile.exists() && !rhqLogFile.isDirectory()) { + try { + PropertyMap serverLogEventSource = new PropertyMap("serverLog"); + serverLogEventSource.put(new PropertySimple( + LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.LOG_FILE_PATH, rhqLogFile + .getCanonicalPath())); + serverLogEventSource.put(new PropertySimple( + LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.ENABLED, Boolean.FALSE)); + serverLogEventSource.put(new PropertySimple( + LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.MINIMUM_SEVERITY, "info")); + PropertyList logEventSources = pluginConfig + .getList(LogFileEventResourceComponentHelper.LOG_EVENT_SOURCES_CONFIG_PROP); + logEventSources.add(serverLogEventSource); + } catch (IOException e) { + log.warn("Unable to setup RHQ Server log file monitoring.", e); + } + } + } + + private String getJnpURL(JBossInstanceInfo cmdLine, File installHome, File configDir) { + File jnpServiceUrlFile = new File(configDir, "data/jnp-service.url"); + if (jnpServiceUrlFile.exists() && jnpServiceUrlFile.canRead()) { + try { + BufferedReader br = new BufferedReader(new FileReader(jnpServiceUrlFile)); + String jnpUrl = br.readLine(); + if (jnpUrl != null) { + if (log.isDebugEnabled()) { + log.debug("Read JNP URL from jnp-service.url file: " + jnpUrl); + } + return jnpUrl; + } + } catch (IOException ioe) { + // Nothing to do + } + } + + log.warn("Failed to read JNP URL from '" + jnpServiceUrlFile + "'."); + + // Above did not work, so fall back to our previous scheme + JnpConfig jnpConfig = getJnpConfig(installHome, configDir, cmdLine.getSystemProperties()); + String jnpAddress = (jnpConfig.getJnpAddress() != null) ? jnpConfig.getJnpAddress() : CHANGE_ME; + if (ANY_ADDRESS.equals(jnpAddress)) { + jnpAddress = LOCALHOST; + } + String jnpPort = (jnpConfig.getJnpPort() != null) ? String.valueOf(jnpConfig.getJnpPort()) : CHANGE_ME; + return "jnp://" + jnpAddress + ":" + jnpPort; + } + + private static JnpConfig getJnpConfig(File installHome, File configDir, Properties props) { + File serviceXML = new File(configDir, JBOSS_SERVICE_XML); + JnpConfig config = JnpConfig.getConfig(installHome, serviceXML, props); + if ((config == null) || (config.getJnpPort() == null)) { + File namingServiceFile = new File(configDir, JBOSS_NAMING_SERVICE_XML); + if (namingServiceFile.exists()) { + config = JnpConfig.getConfig(installHome, namingServiceFile, props); + } + } + return config; + } + + private void initLogEventSourcesConfigProp(File configDir, Configuration pluginConfig) { + File logDir = new File(configDir, "log"); + File serverLogFile = new File(logDir, "server.log"); + if (serverLogFile.exists() && !serverLogFile.isDirectory()) { + PropertyMap serverLogEventSource = new PropertyMap("serverLog"); + serverLogEventSource.put(new PropertySimple( + LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.LOG_FILE_PATH, serverLogFile)); + serverLogEventSource.put(new PropertySimple( + LogFileEventResourceComponentHelper.LogEventSourcePropertyNames.ENABLED, Boolean.FALSE)); + PropertyList logEventSources = pluginConfig + .getList(LogFileEventResourceComponentHelper.LOG_EVENT_SOURCES_CONFIG_PROP); + logEventSources.add(serverLogEventSource); + } + } + + private boolean isSupportedProduct(JBossInstallationInfo installInfo) { + ComparableVersion version = new ComparableVersion(installInfo.getVersion()); + JBossProductType productType = installInfo.getProductType(); + ComparableVersion minimumVersion = MINIMUM_PRODUCT_VERSIONS.get(productType); + // The product is supported if the version is greater than or equal to the minimum version. + boolean supported = (version.compareTo(minimumVersion) >= 0); + if (!supported) { + log.debug(productType + " version " + version + " is not supported by this plugin (minimum " + productType + + " version is " + minimumVersion + ") - skipping..."); + } + return supported; + } + + @NotNull + private static File resolvePathRelativeToHomeDir(Configuration pluginConfig, @NotNull String path) { + File configDir = new File(path); + if (!configDir.isAbsolute()) { + String homeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.HOME_DIR).getStringValue(); + configDir = new File(homeDir, path); + } + return configDir; + } +} diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index 1eef403..d674b91 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -1,2965 +1,2965 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<!DOCTYPE plugin [ - -<!ENTITY managedObjectMetrics ' - <metric property="runState" displayType="summary" - defaultOn="true" defaultInterval="30000" dataType="trait" category="performance"/> -'> - -<!ENTITY datasourceAndConnectionFactoryOperations ' - <operation name="flush" displayName="Flush" - description="Flush the connections in the pool"/> - - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" - description="Obtain a formatted sub pool statistics report"> - <parameters> - <c:simple-property required="false" name="formatClassName" - defaultValue="org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter"> - <c:description> - The fully qualified name of the Java class to use to format the the sub pool statistics. The default - is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter". - </c:description> - </c:simple-property> - </parameters> - <results> - <c:simple-property name="result" type="longString"> - <c:description> - A formatted sub pool statistics report. - </c:description> - </c:simple-property> - </results> - </operation> - - <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report"> - <results> - <c:map-property name="result"/> - </results> - </operation> - - <operation name="testConnection" displayName="Test Connection" description="Test if a connection can be obtained"> - <results> - <c:notes>Test if a connection can be obtained</c:notes> - <c:simple-property type="boolean" name="result" description="Was a connection obtained?"/> - </results> - </operation> -'> - - -<!ENTITY datasourceMetrics ' -  - <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" - defaultOn="true" defaultInterval="60000" dataType="trait" category="performance" - description="the JNDI name of the connection pool for this datasource"/> - -  - <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the maximum number of connections that are available"/> - - <metric property="connectionCount" measurementType="dynamic" displayType="summary" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the number of connections that are currently in the pool"/> - - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the number of connections that have been created since the datasource was last started"/> - - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the number of connections that have been destroyed since the datasource was last started"/> - - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the number of connections that are currently in use"/> - - <metric property="local-transaction" displayType="summary" - defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" - description="the most connections that have been simultaneously in use since this datasource was started"/> - - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> -'> - - - -<!ENTITY datasourceAndConnectionFactoryConnectionResourceConfigProps ' - <c:simple-property name="min-pool-size" - displayName="Minimum Pool Size" - type="integer" - required="false" - defaultValue="0"> - <c:description> - The minimum number of connections the pool should hold. The default is 0. - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> - - <c:simple-property name="max-pool-size" - displayName="Maximum Pool Size" - type="integer" - required="false" - defaultValue="10"> - <c:description> - The maximum number of connections the pool should hold. The default is 10. - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> -'> - -<!ENTITY datasourceConnectionResourceConfigProps ' - <c:simple-property name="jndi-name" - displayName="JNDI Name" - description="The global JNDI Name under which to bind the datasource" - type="string"/> - - <c:simple-property name="user-name" - displayName="Username" - description="The default username when creating a new connection." - type="string" - activationPolicy="immediate" - required="false"/> - - <c:simple-property name="password" - displayName="Password" - description="The default password when creating a new connection." - type="password" - activationPolicy="immediate" - required="false"/> -'> - -<!ENTITY datasourceAndConnectionFactoryAdvancedResourceConfigProps ' - <c:simple-property name="allocation-retry" type="integer" required="false" - defaultValue="0"> - <c:description> - The number of times that allocating a connection should be tried before throwing an exception. The default - is 0. - </c:description> - </c:simple-property> - - <c:simple-property name="allocation-retry-wait-millis" type="long" required="false" units="milliseconds" - defaultValue="5000"> - <c:description> - The time in milliseconds to wait between retrying to allocate a connection. The default is 5000 (5 seconds). - </c:description> - </c:simple-property> - - <c:simple-property name="background-validation" type="boolean" required="false" defaultValue="false"> - <c:description> - Specify if connections should be validated on a background thread versus being validated - prior to use. Background validation is meant to reduce the overall load on the RDBMS system when validating - a connection. The default is No. - </c:description> - </c:simple-property> - - <c:simple-property name="background-validation-millis" type="long" required="false" units="milliseconds" - defaultValue="0"> - <c:description> - The interval, in milliseconds, at which the ConnectionValidator will run. Set to 0 to disable background - validation. The default is 0. - </c:description> - </c:simple-property> - - <c:simple-property name="blocking-timeout-millis" displayName="Blocking Timeout in Milliseconds" - units="milliseconds" defaultValue="30000" - type="integer" required="false"> - <c:description> - Indicates the maximum time in milliseconds to block while waiting for a connection before throwing - an exception. Note that this blocks only while waiting for a permit for a connection, and will never - throw an exception if creating a new connection takes an inordinately long time. The default is 30000 - (30 seconds). - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> - - <c:simple-property name="idle-timeout-minutes" type="integer" activationPolicy="immediate" - displayName="Idle Timeout" units="minutes" required="false" defaultValue="30"> - <c:description> - The maximum time, in minutes, a connection may be idle before being closed. The default is 30. - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> - - <c:simple-property name="isSameRM-override-value" type="boolean" required="false"> - <c:description> - If set, unconditionally sets the boolean return value of javax.transaction.xa.XAResource.isSameRM(XAResource). - </c:description> - </c:simple-property> - - <c:simple-property name="jmx-invoker-name" required="false"> - <c:description> - The ObjectName of the JMX Invoker MBean associated with this datasource. - </c:description> - </c:simple-property> - - <c:map-property name="metadata" required="false" description="Metadata properties."> - <c:simple-property required="false" name="typeMapping"> - <c:description> - The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. - </c:description> - <c:property-options> - <c:option name="Cloudscape" value="Cloudscape"/> - <c:option name="DB2" value="DB2"/> - <c:option name="DB2/400" value="DB2/400"/> - <c:option name="Derby" value="Derby"/> - <c:option name="Firebird" value="Firebird"/> - <c:option name="FirstSQL/J" value="FirstSQL/J"/> - <c:option name="Hypersonic SQL" value="Hypersonic SQL"/> - <c:option name="InformixDB" value="InformixDB"/> - <c:option name="Ingres" value="Ingres"/> - <c:option name="InterBase" value="InterBase"/> - <c:option name="MaxDB" value="MaxDB"/> - <c:option name="McKoi" value="McKoi"/> - <c:option name="Mimer SQL" value="Mimer SQL"/> - <c:option name="MS SQLSERVER" value="MS SQLSERVER"/> - <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/> - <c:option name="Oracle7" value="Oracle7"/> - <c:option name="Oracle8" value="Oracle8"/> - <c:option name="Oracle9i" value="Oracle9i"/> - <c:option name="PointBase" value="PointBase"/> - <c:option name="PostgreSQL" value="PostgreSQL"/> - <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/> - <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/> - <c:option name="SapDB" value="SapDB"/> - <c:option name="SOLID" value="SOLID"/> - <c:option name="Sybase" value="Sybase"/> - </c:property-options> - </c:simple-property> - </c:map-property> - - <c:simple-property name="no-tx-separate-pools" type="boolean" - displayName="No Tx Separate Pools" required="false"> - <c:description> - If true, the datasource cannot reuse a connection outside a transaction once enlisted in a global transaction - and vice-versa. The default is Yes. - </c:description> - </c:simple-property> - - <c:simple-property name="prefill" type="boolean" required="false"> - <c:description> - Whether to attempt to prefill the connection pool to the minimum number of connections. NOTE: Only - supporting pools (OnePool) support this feature. A warning can be found in the logs if the pool does not - support this. The default is No. - </c:description> - </c:simple-property> - - <c:map-property name="security-domain" displayName="Security Settings" required="false"> - <c:description> - Security settings for connections in the pool. - </c:description> - - <c:simple-property name="securityDeploymentType" type="string" - required="false" defaultValue="NONE"> - <c:description> - Indicates whether Subject (from security domain), application-supplied parameters - (such as from getConnection(user, pw)), both Subject and app-supplied parameters, - or neither Subject nor app-supplied parameters are used to distinguish connections - in the pool. The default is "NONE". - </c:description> - <c:property-options> - <c:option name="None" value="NONE"/> - <c:option name="Application" value="APPLICATION"/> - <c:option name="Domain" value="DOMAIN"/> - <c:option name="Domain and Application" value="DOMAIN_AND_APPLICATION"/> - </c:property-options> - </c:simple-property> - - <c:simple-property name="domain" type="string" - required="false"> - <c:description> - The name of the JAAS security manager that will handle authentication (only required if security - deployment type is DOMAIN or DOMAIN_AND_APPLICATION). This name correlates to the JAAS login-config.xml - descriptor application-policy/name attribute. - </c:description> - </c:simple-property> - </c:map-property> - - <c:simple-property name="statistics-formatter" required="false"> - <c:description> - The fully qualified class name of the class to use for formatting managed connection pool statistics for - this datasource. The class must implement the org.jboss.resource.statistic.formatter.StatisticsFormatter. - interface. The default is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter". - </c:description> - </c:simple-property> - - <c:simple-property name="type-mapping" displayName="Type Mapping" required="false"> - <c:description> - The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. - </c:description> - <c:property-options> - <c:option name="Cloudscape" value="Cloudscape"/> - <c:option name="DB2" value="DB2"/> - <c:option name="DB2/400" value="DB2/400"/> - <c:option name="Derby" value="Derby"/> - <c:option name="Firebird" value="Firebird"/> - <c:option name="FirstSQL/J" value="FirstSQL/J"/> - <c:option name="Hypersonic SQL" value="Hypersonic SQL"/> - <c:option name="InformixDB" value="InformixDB"/> - <c:option name="Ingres" value="Ingres"/> - <c:option name="InterBase" value="InterBase"/> - <c:option name="MaxDB" value="MaxDB"/> - <c:option name="McKoi" value="McKoi"/> - <c:option name="Mimer SQL" value="Mimer SQL"/> - <c:option name="MS SQLSERVER" value="MS SQLSERVER"/> - <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/> - <c:option name="Oracle7" value="Oracle7"/> - <c:option name="Oracle8" value="Oracle8"/> - <c:option name="Oracle9i" value="Oracle9i"/> - <c:option name="PointBase" value="PointBase"/> - <c:option name="PostgreSQL" value="PostgreSQL"/> - <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/> - <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/> - <c:option name="SapDB" value="SapDB"/> - <c:option name="SOLID" value="SOLID"/> - <c:option name="Sybase" value="Sybase"/> - </c:property-options> - </c:simple-property> - - <c:simple-property name="use-java-context" - displayName="Use Java Context" - type="boolean" defaultValue="true" - required="false"> - <c:description> - Indicates whether the JNDI name should be bound under the "java" context, - which causes the DataSource to only be accessible from within the JBossAS VM. - The default is Yes. - </c:description> - </c:simple-property> - - <c:simple-property name="use-strict-min" type="boolean" required="false"> - <c:description> - Whether idle connections below the min-pool-size should be closed. The default is No. - </c:description> - </c:simple-property> - - <c:simple-property name="validate-on-match" type="boolean" required="false" defaultValue="true"> - <c:description> - The validate-on-match element indicates whether or not connection level validation should be done when a - connection factory attempts to match a managed connection for a given set. This is typically exclusive to - the use of background validation. The default is Yes. - </c:description> - </c:simple-property> -'> - -<!ENTITY datasourceAdvancedResourceConfigProps ' - <c:simple-property name="check-valid-connection-sql" type="longString" - displayName="Check Valid Connection SQL" required="false"> - <c:description>The SQL statement to use to check the validity of a pool connection.</c:description> - </c:simple-property> - - <c:simple-property required="false" name="connection-definition"> - <c:description> - The connection definition inside the RAR deployment uniquely identified by the connection factory interface, - e.g. "javax.sql.DataSource". - </c:description> - </c:simple-property> - - <c:simple-property name="exception-sorter-class-name" type="string" activationPolicy="immediate" - displayName="Exception Sorter Class Name" required="false"> - <c:description> - The fully qualified name of a Java class implementing the org.jboss.resource.adapter.jdbc.ExceptionSorter - interface that should be used to check if a JDBC exception should be broadcast. - </c:description> - </c:simple-property> - - <c:simple-property name="new-connection-sql" type="longString" activationPolicy="immediate" - displayName="New Connection SQL" required="false"> - <c:description> - An SQL statement to execute whenever a new connection is added to the pool; this can be used to set the - connection schema, etc. - </c:description> - </c:simple-property> - - <c:simple-property name="prepared-statement-cache-size" type="integer" - displayName="Prepared Statement Cache Size" required="false" defaultValue="0"> - <c:description> - The number of prepared statements per connection to be kept open and reused in subsequent requests. They are - stored in an LRU cache. Set to 0 to disable the cache. The default is 0. - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> - - <c:simple-property name="query-timeout" - displayName="Query Timeout" - type="integer" - units="seconds" - required="false"> - <c:description> - Any configured query timeout in seconds. A value of 0 means no timeout. The default is 0. - </c:description> - </c:simple-property> - - <c:simple-property name="rar-name" required="false"> - <c:description> - The RAR deployment to associate with the connection manager MBean. e.g. jms-ra.rar or - myapplication.ear#my.rar for nested rars. - </c:description> - </c:simple-property> - - <c:simple-property name="set-tx-query-timeout" - displayName="Set Tx Query Timeout" - type="boolean" - required="false" - defaultValue="false"> - <c:description> - Whether to set the query timeout based on the time remaining until transaction timeout; - any configured query timeout will be used if there is no transaction. The default is No. - </c:description> - </c:simple-property> - - <c:simple-property name="share-prepared-statements" displayName="Share Prepared Statements" - type="boolean" - required="false" defaultValue="false"> - <c:description> - Should prepared statements be shared? The default is No. - </c:description> - </c:simple-property> - - <c:simple-property name="stale-connection-checker-class-name" - displayName="Stale Connection Checker Class Name" - type="string" - required="false"> - <c:description> - Fully qualified name of the Java class used to check if a connection has become stale. - </c:description> - </c:simple-property> - - <c:simple-property name="track-statements" type="string" - displayName="Track Statements" required="false"> - <c:description> - Whether to check for unclosed Statements and ResultSets when connections are returned to the pool. The - default is "yes-no-warnings". - </c:description> - <c:property-options> - <c:option name="No" value="no"/> - <c:option name="Yes" value="yes"/> - <c:option name="Yes, but no warnings" value="yes-no-warnings" default="true"/> - </c:property-options> - </c:simple-property> - - <c:simple-property name="transaction-isolation" required="false" - description="The Transaction Isolation level. The default setting is to use whichever isolation level is provided by default by the database."> - <c:property-options> - <c:option value="TRANSACTION_READ_UNCOMMITTED" name="Read Uncommitted"/> - <c:option value="TRANSACTION_READ_COMMITTED" default="true" name="Read Committed"/> - <c:option value="TRANSACTION_REPEATABLE_READ" name="Repeatable Read"/> - <c:option value="TRANSACTION_SERIALIZABLE" name="Serializable"/> - <c:option value="TRANSACTION_NONE" name="None"/> - </c:property-options> - </c:simple-property> - - <c:simple-property name="url-delimiter" required="false" default="|"> - <c:description> - Specifies the delimiter for URLs in the value of the connection-url property for HA datasources. - The default is "|". - </c:description> - </c:simple-property> - - <c:simple-property name="url-selector-strategy-class-name" required="false"> - <c:description> - The fully qualified class name of a Java class implementing the - org.jboss.resource.adapter.jdbc.URLSelectorStrategy interface. - </c:description> - </c:simple-property> - - <c:simple-property name="use-try-lock" type="long" required="false" defaultValue="0"> - <c:description> - Any configured timeout, in milliseconds, for internal locks on the resource adapter objects. A value of 0 - means no timeout. The default is 0. - </c:description> - </c:simple-property> - - <c:simple-property name="valid-connection-checker-class-name" type="string" - displayName="Valid Connection Checker Class Name" required="false"> - <c:description> - The fully qualified name of a Java class implementing the - org.jboss.resource.adapter.jdbc.ValidConnectionChecker whose pingDatabase method should be used to check if - a connection is still valid before handing it out from the pool. - </c:description> - </c:simple-property> -'> - -<!ENTITY nonXaDatasourceConnectionResourceConfigProps ' - <c:simple-property name="driver-class" - displayName="JDBC Driver Class" - type="string"> - <c:description> - The fully qualified name of the JDBC driver class (e.g. "oracle.jdbc.driver.OracleDriver"). - </c:description> - </c:simple-property> - - <c:simple-property name="connection-url" - displayName="Connection URL" - type="string"> - <c:description> - The JDBC URL for the database (e.g. "jdbc:oracle:thin:@host.example.com:1521:db"). To define a high - availablity (HA) datasource, specify a list of URLs separated by URL delimiters - (e.g. "jdbc:oracle:thin:@host1.example.com:1521:db1|jdbc:oracle:thin:@host2.example.com:1521:db2"). - </c:description> - </c:simple-property> - - <c:map-property name="connection-properties" required="false" - description="Arbitrary connection properties that should be passed to the java.sql.Driver.connect(url, props) method."/> -'> - -<!ENTITY nonXaDatasourceOracleTemplateProps ' - <c:simple-property name="driver-class" default="oracle.jdbc.driver.OracleDriver"/> - <c:simple-property name="connection-url" default="jdbc:oracle:oci:@youroracle-tns-name"/> - <c:simple-property name="exception-sorter-class-name" - default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/> - <c:simple-property name="check-valid-connection-sql" default="SELECT * FROM DUAL"/> - <c:simple-property name="type-mapping" default="oracle.jdbc.driver.OracleDriver"/> - <c:simple-property name="use-try-lock" default="60000"/> - <c:map-property name="metadata"> - <c:simple-property name="typeMapping" default="Oracle9i"/> - </c:map-property> - <c:simple-property name="type-mapping" default="Oracle9i"/> -'> - - - -<!ENTITY connectionFactoryConnectionResourceConfigProps ' - <c:simple-property required="true" name="jndi-name" displayName="JNDI Name" - description="The global JNDI name to bind the connection factory under."/> - - <c:simple-property required="true" name="rar-name" displayName="RAR Name"> - <c:description> - The name of the RAR file that contains the definition for the resource we want to provide. For nested RAR - files, the name would look like myapplication.ear#my.rar. - </c:description> - </c:simple-property> - - <c:simple-property required="true" name="connection-definition"> - <c:description> - The connection factory interface class. It should match the connectionfactory-interface in the ra.xml file. - </c:description> - </c:simple-property> - -'> - - -<!ENTITY connectionFactoryAdvancedResourceConfigProps ' - <c:list-property required="false" name="config-property"> - <c:description> - Properties to supply to the ManagedConnectionFactory (MCF) MBean service configuration. - </c:description> - <c:map-property name="config-property"> - <c:simple-property name="name" description="The name of the configuration property." /> - <c:simple-property name="type" description="The type of the configuration property."> - <c:property-options> - <c:option value="java.lang.String" default="true"/> - <c:option value="java.lang.Boolean"/> - <c:option value="java.lang.Integer"/> - <c:option value="java.lang.Double"/> - <c:option value="java.lang.Byte"/> - <c:option value="java.lang.Short"/> - <c:option value="java.lang.Long"/> - <c:option value="java.lang.Float"/> - <c:option value="java.lang.Character"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="value" required="false" description="The value of the configuration property." /> - </c:map-property> - </c:list-property> -'> - -<!ENTITY connectionFactoryMetrics ' -  - <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" defaultOn="true" - defaultInterval="600000" dataType="trait" category="performance"/> - -  - <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" - displayName="Available Connection Count" description="Number of available connections." - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="connectionCount" measurementType="dynamic" displayType="summary" - displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" - category="performance"/> - - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" - dataType="measurement" category="performance"/> - - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" - displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" - dataType="measurement" category="performance"/> - - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" - displayName="In Use Connection Count" description="Mumber of connections currently in use." - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" - displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use." - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> -'> - - -<!ENTITY destinationOperations ' - <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages from the destination."/> - - <operation name="start" displayName="Start" description="Start the destination."/> - - <operation name="stop" displayName="Stop" description="Stop the destination."/> -'> - -<!ENTITY deploymentContentConfigProps ' - <configuration> - <c:group name="deployment" displayName="Deployment Options"> - <c:simple-property name="deployExploded" displayName="Deploy Exploded?" type="boolean" required="true" - default="false"> - <c:description> - Should the archive be deployed in exploded form (i.e. as a directory)? - </c:description> - </c:simple-property> - <c:simple-property name="deployFarmed" type="boolean" required="true" default="false"> - <c:description> - Should the application be deployed as a farmed deployment (i.e. to the farm directory, rather than - the deploy directory)? This option should only be set to Yes if this application server instance is - a node in a cluster, otherwise the application creation will fail. If set to Yes, the Deploy - Exploded property must be set to No, since exploded deployments to farm via the Profile Service are - currently not supported. - </c:description> - </c:simple-property> - </c:group> - </configuration> -'> - -<!ENTITY webApplicationMetrics ' - <metric property="contextRoot" - dataType="trait" displayType="summary" - description="this context root of this WAR (e.g. jmx-console) - used as a unique path prefix for URLs - corresponding to this WAR"/> - - <metric property="virtualHosts" - dataType="trait" displayType="summary" - description="the virtual host(s) to which this WAR is deployed"/> -'> - -<!ENTITY webApplicationContextMetrics ' - <metric property="virtualHost" - dataType="trait" displayType="summary" - description="the virtual host with which this context is associated"/> - - <metric property="responseTime" - dataType="calltime" defaultOn="false" defaultInterval="600000" units="milliseconds" destinationType="URL" - description="the minimum, maximum, and average response times for requests serviced by this webapp"/> - - <metric property="activeSessions" - displayName="Currently Active Sessions" - units="none" description="the number of sessions that are currently active for this WAR" /> - - <metric property="maxActive" displayName="Maximum Active Sessions" - units="none" description="the maximum number of sessions that have been active for this WAR" /> - - <metric property="sessionCounter" displayName="Created Sessions" - units="none" description="the number of sessions created for this WAR" - measurementType="trendsup" /> - - <metric property="expiredSessions" displayName="Expired Sessions" - units="none" description="the number of expired sessions for this WAR" - measurementType="trendsup" /> - - <metric property="rejectedSessions" displayName="Rejected Sessions" - units="none" description="the number of sessions rejected for this WAR" - measurementType="trendsup" /> - - <metric property="sessionAverageAliveTime" displayName="Average Session Alive Time" - units="seconds" description="the average alive time of sessions for this WAR" /> - - <metric property="sessionMaxAliveTime" displayName="Max Session Alive Time" - units="seconds" description="the maximum alive time of sessions for this WAR" /> - - <metric property="Servlet.minimumResponseTime" displayName="Minimum Response Time" - units="milliseconds" - description="the minimum response time for requests serviced by this WAR"/> - - <metric property="Servlet.averageResponseTime" displayName="Average Response Time" - units="milliseconds" - description="the average response time for requests serviced by this WAR"/> - - <metric property="Servlet.maximumResponseTime" displayName="Maximum Response Time" - units="milliseconds" - description="the maximum response time for requests serviced by this WAR"/> - - <metric property="Servlet.totalResponseTime" displayName="Total Response Time" - units="milliseconds" measurementType="trendsup" - description="the total response time for requests serviced by this WAR"/> - - <metric property="Servlet.requestCount" displayName="Number of Requests Serviced" - units="none" description="the number of requests serviced by this WAR" - measurementType="trendsup" displayType="summary"/> - - <metric property="Servlet.errorCount" displayName="Number of Error Responses" - units="none" description="the number of error responses sent by this WAR" - measurementType="trendsup" displayType="summary"/> -'> - -<!ENTITY ejb3StatelessSessionBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB3" readOnly="true"/> - <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb3StatefulSessionBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB3" readOnly="true"/> - <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb3MessageDrivenBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB3" readOnly="true"/> - <c:simple-property name="componentSubtype" default="MessageDriven" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb3CommonMetrics ' - <metric property="name" displayName="EJB Name" dataType="trait" displayType="summary" - description="the name of this EJB"/> -'> - -<!ENTITY ejb3SessionBeanMetrics ' - <metric property="availableCount" - description="The number of pooled instances of this EJB3 Session Bean in the method-ready state"/> - - <metric property="createCount" displayType="summary" measurementType="trendsup" - description="The number of instances of this EJB3 Session Bean that have been created since server start"/> - - <metric property="currentSize" displayName="Current Count" - description="The total number of currently pooled instances of this EJB3 Session Bean"/> - - <metric property="maxSize" - description="The maximum number of instances that are allowed to be pooled"/> - - <metric property="removeCount" displayType="summary" measurementType="trendsup" - description="The number of instances of this EJB3 Session Bean that have been removed since server start"/> - -  - <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" - description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> -'> - -<!ENTITY ejb3StatefulSessionBeanMetrics ' - <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> -'> - -<!ENTITY ejb3MessageDrivenBeanMetrics ' - <metric property="minPoolSize" measurementType="dynamic" displayType="detail" displayName="Minimum Pool Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="maxPoolSize" measurementType="dynamic" displayType="detail" displayName="Maximum Pool Size" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - - <metric property="maxMessages" measurementType="dynamic" displayType="detail" displayName="Maximum number of Messages" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> -'> - -<!ENTITY ejb2PoolMetrics ' - <metric property="CurrentPoolSize" displayName="Current Pool Size" displayType="summary" measurementType="dynamic" - description="The number of beans in the pool."/> - - <metric property="MaxPoolSize" displayName="Max Pool Size" displayType="summary" measurementType="dynamic" - description="The maximum pool size."/> -'> - -<!ENTITY ejb2CreateRemoveMetrics ' - <metric property="CreateCount" displayName="Create Count" displayType="summary" measurementType="trendsup" - description="The number of instances of this EJB2 Session Bean that have been created. since server start."/> - - <metric property="RemoveCount" displayName="Remove Count" displayType="summary" measurementType="trendsup" - description="The number of instances of this EJB2 Session Bean that have been removed since server start."/> -'> - -<!ENTITY ejb2SessionBeanMetrics ' -  - <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" - description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> -'> - -<!ENTITY ejbInvocationStatsOperation ' - <operation name="viewInvocationStats" displayName="View Method Statistics" description="Display detailed method invocation statistics."> - <results> - <c:list-property name="methods"> - <c:map-property name="method"> - <c:simple-property name="methodName" displayName="Method Name" /> - <c:simple-property name="count" displayName="Count" description="The number of times this method has been called."/> - <c:simple-property name="totalTime" displayName="Total Time" description="The total time spent executing this method."/> - <c:simple-property name="minTime" displayName="Min Invocation Time" description="The fastest execution of this method."/> - <c:simple-property name="maxTime" displayName="Max Invocation Time" description="The slowest execution of this method."/> - </c:map-property> - </c:list-property> - </results> - </operation> -'> - -<!ENTITY ejb2StatelessSessionBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB" readOnly="true"/> - <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb2StatelessSessionBeanMetrics ' -  -'> - -<!ENTITY ejb2StatefulSessionBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB" readOnly="true"/> - <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb2StatefulSessionBeanMetrics ' - <metric displayName="Passive Beans" - description="The count of beans in the passivated state" - property="PassivatedCount" - displayType="summary"/> -'> - -<!ENTITY ejb2MessageDrivenBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB" readOnly="true"/> - <c:simple-property name="componentSubtype" default="MDB" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb2MessageDrivenBeanMetrics ' - <metric property="MessageCount" displayName="Message Count" - description="The number of messages sent/received" - displayType="summary" - measurementType="trendsup" /> -'> - -<!ENTITY ejb2EntityBeanDefinition ' - <plugin-configuration> - <c:simple-property name="componentType" default="EJB" readOnly="true"/> - <c:simple-property name="componentSubtype" default="Entity" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </plugin-configuration> -'> - -<!ENTITY ejb2EntityBeanMetrics ' - <metric property="CacheSize" - displayName="Cache Size" - displayType="summary" - defaultOn="true"/> -'> - -<!ENTITY subscriptionsResultProperty ' - <c:list-property name="result"> - <c:map-property name="subscription"> - <c:simple-property name="id" summary="true" - description="the unique ID of the subscription"/> - <c:simple-property name="clientID" - description="the subscriber-specified client ID"/> - <c:simple-property name="name" - description="the topic name"/> - <c:simple-property name="selector" required="false" - description="the selector, if the subscriber specified one"/> - <c:simple-property name="durable" type="boolean" summary="true" - description="is the subscription durable?"/> - <c:simple-property name="maxSize" type="integer"/> - <c:simple-property name="messageCount" type="integer" summary="true" - description="the number of messages the subscription has received"/> - </c:map-property> - </c:list-property> -'> - -]> - - - - - -<plugin name="JBossAS5" displayName="JBoss Application Server 5.x" package="org.rhq.plugins.jbossas5" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - description="Supports management and monitoring of JBoss AS from version EAP 5" - xmlns="urn:xmlns:rhq-plugin" - xmlns:c="urn:xmlns:rhq-configuration"> - - <depends plugin="JMX" useClasses="true"/> - - <server name="JBossAS Server" - classLoader="instance" - class="ApplicationServerComponent" - discovery="ApplicationServerDiscoveryComponent" - description="JBoss Application Server (AS) or Enterprise Application Platform (EAP) 5.x"> - - <subcategories> - <subcategory name="Resources" - description="Different types of Resources"> - <subcategory name="Datasources" - description="Different types of Datasources"/> - <subcategory name="Connection Factories" - description="Different types of Connection Factories"/> - <subcategory name="JMS Destinations" - description="Different types of JMS Destinations"/> - </subcategory> - <subcategory name="Applications" - description="Different types of Applications (WARs, EARs, etc.)"> - </subcategory> - </subcategories> - - <plugin-configuration> - <c:group name="connectionInfo"> - <c:simple-property name="namingURL" displayName="Naming Provider URL" - description="The JBoss Naming Provider (JNP) URL with which to connect to the JBoss AS or EAP instance (e.g. jnp://127.0.0.1:1099)."/> - <c:simple-property name="principal" required="false" description="The name of the principal (i.e. user) to authenticate."/> - <c:simple-property name="credentials" type="password" required="false" - description="The credentials (i.e. password) that should be used to authenticate the principal."/> - <c:simple-property name="homeDir" displayName="JBoss Home Directory" type="directory" readOnly="true" - description="The absolute path to the directory where JBoss AS or EAP is installed (e.g. /opt/jboss-5.1.0.GA)."/> - <c:simple-property name="serverHomeDir" type="directory" readOnly="true" - description="The path to the configuration directory under which this instance - operates (e.g. /opt/jboss-5.2.0.GA/server/default); if the path is not absolute, - then it will be resolved relative to {homeDir}."/> - <c:simple-property name="serverName" required="false" - description="The name of the server configuration (e.g. minimal, default, or all); - if not specified, it will default to the last path component of {serverHomeDir}." - default="default"/> - </c:group> - <c:group name="control" displayName="Operations"> - <c:simple-property name="scriptPrefix" displayName="Script Prefix" type="string" required="false" - description="A prefix applied to script execution commands. Typically a sudo - for applicable platforms. The prefix is applied verbatim. As such, a - sudo user must be configured appropriately. Ignored if not set."/> - <c:simple-property name="startScript" displayName="Start Script" type="file" required="false" - description="The path to the script used by the 'Start' operation - to start this JBossAS server - (e.g. /opt/jboss-5.2.0.GA/bin/run.sh); if the path is not absolute, - then it will be resolved relative to {jbossHomeDir}; - defaults to 'bin/run.sh' on UNIX or 'bin\run.bat' on Windows."/> - <c:simple-property name="shutdownScript" displayName="Shutdown Script" type="file" required="false" - description="The path to the script used by the Shut Down operation - to shut down this JBossAS server - (e.g. /opt/jboss-5.2.0.GA/bin/shutdown.sh); if the path is not absolute, - then it will be resolved relative to {jbossHomeDir}; - defaults to 'bin/shutdown.sh' on UNIX or 'bin\shutdown.bat' on Windows."/> - <c:simple-property name="shutdownMethod" displayName="Shutdown Method" type="string" required="false" default="JMX" - description="The method used to execute the Shut Down operation; - defaults to 'JMX MBean'."> - <c:property-options> - <c:option value="JMX" name="JMX MBean" default="true"/> - <c:option value="SCRIPT" name="shutdown script"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="bindAddress" displayName="Bind Address" required="false" default="127.0.0.1" - description="The host or IP address that all application server services should listen on - (e.g. 10.11.14.233 or foo.example.com); specify 0.0.0.0 to tell the - application server to bind to all available network interfaces; defaults to - '127.0.0.1'."/> - </c:group> - - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="shutdownMBeanName" displayName="Shutdown MBean Name" - default="jboss.system:type=Server" - description="Name of the MBean to use when shutting down this server through JMX."/> - <c:simple-property name="shutdownMBeanOperation" displayName="Shutdown MBean Operation" default="shutdown" - description="Name of the operation to invoke when shutting down this server through JMX. - Note that only operations with no parameter or with one int parameter are supported. If the - operation requires an int parameter, '0' will be supplied."/> - <c:simple-property name="availabilityCheckPeriod" description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down." - units="seconds" required="false" type="integer"> - <c:constraint> - <c:integer-constraint minimum="60"/> - </c:constraint> - </c:simple-property> - </c:group> - - <c:group name="events"> - <c:list-property name="logEventSources"> - <c:map-property name="logEventSource"> - <c:simple-property name="logFilePath" type="file" summary="true" - description="The absolute path to the source log file."/> - <c:simple-property name="enabled" type="boolean" summary="true" - description="A flag indicating whether of not this log Event source is currently - enabled (i.e. whether the associated log file should be tailed for - new entries)."/> - <c:simple-property name="dateFormat" required="false" - description="The date format to use when parsing the dates in log entries. The - format must be in the syntax defined by the Java SimpleDateFormat - class. If not specified, the three date formats that are predefined - by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/> - <c:simple-property name="includesPattern" required="false" - description="A regular expression against which a log entry's detail is matched - to determine if an Event should be fired for that entry. If not - specified, no filtering of log entries will be done based on their - detail."/> - <c:simple-property name="minimumSeverity" required="false" default="error" - description="The minimum severity of Events that should be collected for this - source. If not specified, there is no minimum severity (i.e. all - events will be collected)."> - <c:property-options> - <c:option name="debug" value="debug"/> - <c:option name="info" value="info"/> - <c:option name="warn" value="warn"/> - <c:option name="error" value="error" default="true"/> - <c:option name="fatal" value="fatal"/> - </c:property-options> - </c:simple-property> - </c:map-property> - </c:list-property> - </c:group> - </plugin-configuration> - - <process-scan name="jbossas" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/> - - <operation name="start" displayName="Start" - description="Start this application server. The script used is specified in the Operations group of connection properties. This operation will fail if the server is already started."> - <results><c:simple-property name="operationResult" description="Outcome of starting the server."/></results> - </operation> - - <operation name="shutdown" displayName="Shut Down" - description="Shut down this application server via script or JMX, depending on the settings in the Operations and Advanced groups of connection properties. This operation will fail if the server is already shut down."> - <results><c:simple-property name="operationResult" description="Outcome of shutting down the server."/></results> - </operation> - - <operation name="restart" displayName="Restart" - description="Shut down (if started) and then start this application server."> - <results><c:simple-property name="operationResult" description="Outcome of restarting the server."/></results> - </operation> - - <metric displayName="Partition Name" property="MCBean|ServerConfig|*|partitionName" - dataType="trait" displayType="summary" - description="the name of the cluster partition this server belongs to"/> - - <metric displayName="Server Name" property="MCBean|ServerConfig|*|serverName" - dataType="trait" displayType="summary" - description="the name of the active profile (i.e. configuration set) this server is using"/> - - <metric displayName="Server Home Dir" property="MCBean|ServerConfig|*|serverHomeDir" - dataType="trait" displayType="summary" - description="the full path of the configuration set directory this server is using (e.g. /opt/jboss-5.1.0.CR1/server/default)"/> - - <metric displayName="Home Dir" property="MCBean|ServerConfig|*|serverHomeDir" - dataType="trait" displayType="summary" - description="the full path of the JBoss AS installation directory this server is using (e.g. /opt/jboss-5.1.0.CR1)"/> - - <metric displayName="Version Name" property="MCBean|MCServer|*|versionName" - dataType="trait" displayType="summary" - description="the code name for the this app server instance's major version (AS 5.0 = Morpheus, AS 5.1 = The Oracle, AS 6.0 = Neo)"/> - - <metric displayName="Build Date" property="MCBean|MCServer|*|buildDate" - dataType="trait" displayType="summary" - description="the date this app server was built"/> - - <metric displayName="Start Date" property="MCBean|MCServer|*|startDate" - dataType="trait" displayType="summary" - description="the date and time this app server instance was started"/> - - <metric displayName="Active Thread Count" property="MCBean|ServerInfo|*|activeThreadCount" - description="The current number of active threads for this app server instance" - defaultInterval="300000" displayType="summary" category="throughput"/> - - <metric displayName="Active Thread Group Count" property="MCBean|ServerInfo|*|activeThreadGroupCount" - description="The current number of active thread groups for this app server instance" - defaultInterval="300000" defaultOn="true" category="throughput"/> - - <metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary" - description="The amount of free memory for the JVM this app server instance is running on" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> - - <metric displayName="JVM Max Memory" property="MCBean|ServerInfo|*|maxMemory" - description="The amount of max memory for the JVM this app server instance is running on" - defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/> - - <metric displayName="JVM Total Memory" property="MCBean|ServerInfo|*|totalMemory" displayType="summary" - description="The amount of total memory for the JVM this app server instance is running on" - defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> - - <metric displayName="Total Transactions" property="MCBean|JTA|*|transactionCount" measurementType="trendsup" - defaultInterval="300000" defaultOn="true" category="utilization" - description="Total number of transactions since last restart"/> - - <metric displayName="Transactions Committed" property="MCBean|JTA|*|commitCount" displayType="summary" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" - description="Number of transactions committed since last restart"/> - - <metric displayName="Transactions Rolled Back" property="MCBean|JTA|*|rollbackCount" measurementType="trendsup" - defaultInterval="600000" defaultOn="true" category="utilization" - description="Number of transactions committed since last restart"/> - - <event name="logEntry" description="an entry was appended to a log file"/> - - <content name="library" displayName="JAR Library" category="deployable" - description="Library Jar files deployed in JBoss AS"> - <configuration> - <c:simple-property name="version" readOnly="true" description="The version declared by the JAR's manifest."/> - <c:simple-property name="title" readOnly="true" description="The title declared by the JAR's manifest."/> - <c:simple-property name="url" readOnly="true" description="The url declared by the JAR's manifest."/> - <c:simple-property name="vendor" readOnly="true" description="The vendor declared by the JAR's manifest."/> - <c:simple-property name="classpath" readOnly="true" - description="The classpath declared by the JAR's manifest."/> - <c:simple-property name="sealed" readOnly="true" type="boolean" description="True if the JAR is sealed."/> - </configuration> - </content> - - <content name="cumulativePatch" displayName="Cumulative Patch" category="deployable" - description="Automatically installable application server patches"> - <configuration> - <c:simple-property name="jiraId"/> - <c:simple-property name="distributionStatus"/> - <c:simple-property name="downloadUrl"/> - <c:simple-property name="instructionCompatibilityVersion"/> - </configuration> - </content> - - <server name="JBoss AS JVM" - description="JVM of the JBossAS" - sourcePlugin="JMX" - sourceType="JMX Server" - discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent" - class="org.rhq.plugins.jmx.JMXServerComponent" - singleton="true"/> - - <service name="JBoss Web" - description="JBoss Web Servlet Container" - subCategory="Resources" - discovery="JBossWebDiscoveryComponent" - class="JBossWebComponent" - singleton="true"> - - <service name="Connector" - description="a JBoss Web Connector" - discovery="ConnectorDiscoveryComponent" - class="ConnectorComponent"> - - <plugin-configuration> - <c:simple-property name="protocol" type="string" description="this connector's protocol (e.g. jk, ajp, http)" default="http"/> - <c:simple-property name="address" type="string" description="the IP address this connector listens on" readOnly="true"/> - <c:simple-property name="port" type="integer" description="the port this connector listens on" readOnly="true"/> - <c:group name="advanced"> - <c:simple-property name="componentType" default="MBean" readOnly="true"/> - <c:simple-property name="componentSubtype" default="WebRequestProcessor" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </c:group> - </plugin-configuration> - - <metric property="maxTime" - displayName="Maximum Request Time" - description="the maximum time it took to process a request since the last restart" - units="milliseconds" - defaultOn="true" category="performance"/> - - <metric property="requestCount" - displayName="Request Count" description="the total number of requests processed since the last restart" - defaultOn="false" category="utilization" measurementType="trendsup"/> - - <metric property="errorCount" - displayName="Error Count" description="the number of errors while processing requests since the last restart" - defaultOn="true" category="utilization" measurementType="trendsup"/> - - <metric property="ThreadPool|currentThreadsBusy" - displayName="Current Active Threads" - defaultOn="true" category="utilization" displayType="summary" - description="the number of threads for this connector that are currently active"/> - - <metric property="ThreadPool|currentThreadCount" - displayName="Current Thread Count" - defaultOn="true" category="utilization" displayType="summary" - description="the number of threads for this connector that currently exist"/> - - </service> - - <service name="Virtual Host" - discovery="VirtualHostDiscoveryComponent" - class="VirtualHostComponent" - description="a JBoss Web virtual host"> - - <plugin-configuration> - <c:simple-property name="name" type="string" description="the virtual host's name (e.g. localhost)"/> - <c:group name="advanced"> - <c:simple-property name="componentType" default="MBean" readOnly="true"/> - <c:simple-property name="componentSubtype" default="WebHost" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </c:group> - </plugin-configuration> - - <metric property="aliases" - description="the aliases for this virtual host, if any" - dataType="trait" displayType="summary"/> - </service> - - </service> - - -  - - <service name="No Tx Datasource" - class="ManagedComponentComponent" - discovery="ManagedComponentDiscoveryComponent" - createDeletePolicy="both" - subCategory="Datasources" - description="No Transaction Datasources deployed in the instance of JBoss AS"> - - <plugin-configuration> - <c:simple-property name="componentType" default="DataSource" readOnly="true"/> - <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="NoTxDataSourceTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - </plugin-configuration> - - &datasourceAndConnectionFactoryOperations; - - &managedObjectMetrics; - &datasourceMetrics; - - <resource-configuration> - -  - - <c:group name="connection" displayName="Connection Information"> - &datasourceConnectionResourceConfigProps; - &datasourceAndConnectionFactoryConnectionResourceConfigProps; - &nonXaDatasourceConnectionResourceConfigProps; - </c:group> - - <c:group name="advanced" displayName="Advanced"> - &datasourceAndConnectionFactoryAdvancedResourceConfigProps; - &datasourceAdvancedResourceConfigProps; - </c:group> - - <c:template name="Oracle No TX" description="No Transaction Datasource for Oracle"> - &nonXaDatasourceOracleTemplateProps; - </c:template> - - </resource-configuration> - - </service> - - <service name="Local Tx Datasource" - class="ManagedComponentComponent" - discovery="ManagedComponentDiscoveryComponent" - createDeletePolicy="both" - subCategory="Datasources" - description="Local Transaction Datasources deployed in the instance of JBoss AS"> - - <plugin-configuration> - <c:simple-property name="componentType" default="DataSource" readOnly="true"/> - <c:simple-property name="componentSubtype" default="LocalTx" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="LocalTxDataSourceTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - </plugin-configuration> - - &datasourceAndConnectionFactoryOperations; - - &managedObjectMetrics; - &datasourceMetrics; - - <resource-configuration> - -  - - <c:group name="connection" displayName="Connection Information"> - &datasourceConnectionResourceConfigProps; - &datasourceAndConnectionFactoryConnectionResourceConfigProps; - &nonXaDatasourceConnectionResourceConfigProps; - </c:group> - - <c:group name="advanced" displayName="Advanced"> - &datasourceAndConnectionFactoryAdvancedResourceConfigProps; - &datasourceAdvancedResourceConfigProps; - </c:group> - - <c:template name="Oracle Local TX" description="Local Transaction Datasource for Oracle"> - &nonXaDatasourceOracleTemplateProps; - <c:simple-property name="track-connection-by-tx" default="true"/> - </c:template> - - </resource-configuration> - - </service> - - <service name="XA Datasource" - class="ManagedComponentComponent" - discovery="ManagedComponentDiscoveryComponent" - createDeletePolicy="both" - subCategory="Datasources" - description="XA Datasources deployed in the instance of JBoss AS"> - - <plugin-configuration> - <c:simple-property name="componentType" default="DataSource" readOnly="true"/> - <c:simple-property name="componentSubtype" default="XA" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="XADataSourceTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - </plugin-configuration> - - &datasourceAndConnectionFactoryOperations; - - &managedObjectMetrics; - &datasourceMetrics; - - <resource-configuration> - -  - <c:group name="connection" displayName="Connection Information"> - - &datasourceConnectionResourceConfigProps; - &datasourceAndConnectionFactoryConnectionResourceConfigProps; - - <c:simple-property name="xa-datasource-class" - displayName="XA DataSource Class" - description="The fully qualified name of the javax.sql.XADataSource implementation class." - activationPolicy="immediate"/> - - <c:map-property name="xa-datasource-properties" displayName="XA Datasource Properties" required="true"> - <c:description> - The properties to assign to the XADataSource implementation class. - Each property is mapped - onto the XADataSource implementation by looking for a JavaBeans style - getter method for the property name. If found, the value of the property is - set using the JavaBeans setter with the element text translated to the true - property type using the java.beans.PropertyEditor for the type. - </c:description> - </c:map-property> - - <c:simple-property name="xa-resource-timeout" - displayName="XA Resource Timeout" - required="false" - type="integer" - activationPolicy="immediate"> - <c:description> - XA transaction timeout, in seconds (passed to XAResource.setTransactionTimeout()) - - default is zero which does not invoke the setter. - </c:description> - </c:simple-property> - - <c:simple-property name="url-property" - displayName="URL Property" - required="false" - description="For HA XA datasources, specifies the name of an XADataSource property that contains a list of URLs." - activationPolicy="immediate"/> - </c:group> - - <c:group name="advanced" displayName="Advanced"> - &datasourceAndConnectionFactoryAdvancedResourceConfigProps; - &datasourceAdvancedResourceConfigProps; - - <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false"> - <c:description> - If true, enable transaction interleaving if the DB vendor supports it (most do not). - This property supersedes the "track-connection-by-tx" property from earlier versions of - JBoss AS. The default is false. - </c:description> - </c:simple-property> - </c:group> - - <c:template name="Oracle XA" description="XA Transaction Datasource for Oracle"> - <c:simple-property name="track-connection-by-tx" default="true"/> - <c:simple-property name="isSameRM-override-value" default="false"/> - <c:simple-property name="xa-datasource-class" default="oracle.jdbc.xa.client.OracleXADataSource"/> - <c:simple-property name="exception-sorter-class-name" - default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/> -  - <c:simple-property name="no-tx-separate-pools" default="true"/> - <c:simple-property name="use-try-lock" default="60000"/> - <c:map-property name="metadata"> - <c:simple-property name="typeMapping" default="Oracle9i"/> - </c:map-property> - <c:simple-property name="type-mapping" default="Oracle9i"/> - </c:template> - - </resource-configuration> - - </service> - - <service name="No Tx ConnectionFactory" - description="A ConnectionFactory that does not take part in JTA transactions." - class="ManagedComponentComponent" - createDeletePolicy="both" - subCategory="Connection Factories" - discovery="ManagedComponentDiscoveryComponent"> - - <plugin-configuration> - <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/> - <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="NoTxConnectionFactoryTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - <c:group name="managedPropertyGroup" - displayName="managedPropertyGroup" - hiddenByDefault="true"> - <c:map-property name="customProperties" - description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> - <c:simple-property name="config-property" - default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" /> - </c:map-property> - </c:group> - </plugin-configuration> - - &datasourceAndConnectionFactoryOperations; - - &managedObjectMetrics; - &connectionFactoryMetrics; - - <resource-configuration> - - <c:group name="connection" displayName="Connection Information"> - &connectionFactoryConnectionResourceConfigProps; - &datasourceAndConnectionFactoryConnectionResourceConfigProps; - </c:group> - - <c:group name="advanced" displayName="Advanced"> - &datasourceAndConnectionFactoryAdvancedResourceConfigProps; - &connectionFactoryAdvancedResourceConfigProps; - </c:group> - </resource-configuration> - - </service> - - <service name="Tx ConnectionFactory" - description="A ConnectionFactory that takes part in JTA transactions." - class="TxConnectionFactoryComponent" - createDeletePolicy="both" - subCategory="Connection Factories" - discovery="ManagedComponentDiscoveryComponent"> - - <plugin-configuration> - <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/> - <c:simple-property name="componentSubtype" default="Tx" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="TxConnectionFactoryTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - <c:group name="managedPropertyGroup" - displayName="managedPropertyGroup" - hiddenByDefault="true"> - <c:map-property name="customProperties" - description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> - <c:simple-property name="config-property" - default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" /> - </c:map-property> - </c:group> - </plugin-configuration> - - &datasourceAndConnectionFactoryOperations; - - <metric property="custom.transactionType" displayName="Transaction Type" displayType="summary" - description="The type of transactions used by this connection factory - Local or XA" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - - &managedObjectMetrics; - &connectionFactoryMetrics; - - <resource-configuration> - - <c:group name="connection" displayName="Connection Information"> - - &connectionFactoryConnectionResourceConfigProps; - &datasourceAndConnectionFactoryConnectionResourceConfigProps; - - <c:simple-property name="xa-transaction" - type="boolean" - displayName="XA Transaction" - required="false" readOnly="true"> - <c:description> - Whether on not to use XA transactions. The default is No. - </c:description> - </c:simple-property> - - </c:group> - - <c:group name="advanced" displayName="Advanced"> - - &datasourceAndConnectionFactoryAdvancedResourceConfigProps; - &connectionFactoryAdvancedResourceConfigProps; - - <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false"> - <c:description> - If true, enable transaction interleaving if the DB vendor supports it (most do not). - Can only be set to true if XA transactions are enabled. - This property supersedes the "track-connection-by-tx" property from earlier versions of - JBoss AS. The default is false. - </c:description> - </c:simple-property> - - <c:simple-property name="xa-resource-timeout" - type="integer" - displayName="XA Resource Timeout" - units="minutes" - defaultValue="0" - required="false"> - <c:description> - The maximum time, in minutes, an XA Resource can be idle before it is removed. 0 means no - timeout. The default is 0. - </c:description> - <c:constraint> - <c:integer-constraint minimum="0"/> - </c:constraint> - </c:simple-property> - - </c:group> - - <c:template name="Local Transaction" description="a connection factory that uses local transactions"> - <c:simple-property name="xa-transaction" default="false"/> - </c:template> - - <c:template name="XA Transaction" description="a connection factory that uses XA transactions"> - <c:simple-property name="xa-transaction" default="true"/> - </c:template> - </resource-configuration> - - </service> - - <service name="Queue" - class="JmsDestinationComponent" - createDeletePolicy="both" - subCategory="JMS Destinations" - discovery="JmsDestinationDiscoveryComponent"> - - <plugin-configuration> - <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/> - <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true"> - <c:simple-property name="jms-type" default="queue"/> - <c:map-property name="customProperties" - description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> - <c:simple-property name="securityConfig" - default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/> - </c:map-property> - </c:group> - </plugin-configuration> - - &destinationOperations; - - <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="selector"/> - </parameters> - <results> - <c:notes>List all messages with selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="selector"/> - </parameters> - <results> - <c:notes>List all durable messages using a selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="selector"/> - </parameters> - <results> - <c:notes>List all non durable messages using a selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML"> - <results> - <c:notes>Get the message counter as HTML</c:notes> - <c:simple-property name="result" type="longString"/> - </results> - </operation> - - <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML"> - <results> - <c:notes>Get the message counter history as HTML</c:notes> - <c:simple-property name="result" type="longString"/> - </results> - </operation> - - <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/> - - <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/> - - &managedObjectMetrics; - -  - - <metric property="createdProgrammatically" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" - description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/> - -  - <metric property="messageCounterHistoryDayLimit" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" - description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/> - -  - - <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The number of consumers on the queue"/> - - <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The number of messages currently being delivered"/> - - <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The number of messages in the queue"/> - - <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The number of scheduled messages in the queue"/> - - <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" - description="The total message count since startup or last counter reset"/> - - <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" - description="The message count delta since last method call"/> - - <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" - description="The current message count of pending messages within the queue waiting for dispatch"/> - - <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" - description="The message count delta of pending messages since last method call"/> - - <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" - description="The timestamp of the last message add"/> - - <resource-configuration> - -  - - <c:simple-property required="true" name="name" readOnly="true" - description="The name of this queue (e.g. 'MyQueue')."/> - - <c:simple-property required="true" name="JNDIName" readOnly="true" - description="This queue's JNDI name (e.g. '/queue/MyQueue')."/> - - <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false"> - <c:description> - Is this queue clustered? For an existing queue, this property is read-only. If not specified - when creating a new queue, the default value is false. - </c:description> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000"> - <c:description> - When paging messages to storage from a subscription, they first go into a "Down Cache" before - being written to storage. This enables the write to occur as a single operation, thus aiding - performance. This setting determines the maximum number of messages that the Down Cache will hold - before they are flushed to storage. - Updates to this property will not go into effect until the queue has been restarted. - The default value is 2000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000"> - <c:description> - The maximum number of messages for the queue held in memory at any one time. - The actual queue can hold many more messages than this, but these are paged to and from - storage as necessary, as messages are added or consumed. - Updates to this property will not go into effect until the queue has been restarted. - The default value is 200000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1"> - <c:description> - The number of delivery attempts before a message to a subscriber of this queue is moved to the - DLQ. The default value is 10. A value of -1 indicates the default value should be used. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1"> - <c:description> - The maximum number of messages this queue can hold before they are dropped. - A value of -1 means there is no maximum. The default value is -1. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000"> - <c:description> - When loading messages from a subscription, this is the maximum number of messages to - pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size. - Updates to this property will not go into effect until the queue has been restarted. - The default value is 2000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1"> - <c:description> - The delay in milliseconds before a rolled back or recovered message is redelivered. - Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="DLQ"> - <c:description> - The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g. - "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the - server peer. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="expiryQueue"> - <c:description> - The JMX ObjectName of the expiry queue for this queue (e.g. - "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default - expiry queue on the server peer. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="serverPeer"> - <c:description> - The JMX ObjectName of the server peer this queue was deployed on (e.g. - "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until - the queue has been restarted. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:list-property name="securityConfig" max="4" min="2" - displayName="Security Configurations" - description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute."> - <c:map-property name="role" - displayName="Security Configuration Attributes" - description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue"> - <c:simple-property name="name" - displayName="Name" - description="Name of the Security Role. e.g. Guest" - summary="true" - required="true"/> - <c:simple-property name="read" - displayName="Read" - description="Is this role allowed to read messages?" - summary="true" - required="false" - type="boolean"/> - <c:simple-property name="write" - displayName="Write" - description="Is this role allowed to write messages?" - summary="true" - required="false" - type="boolean"/> - <c:simple-property name="create" - displayName="Create" - description="Is this role allowed to create messages?" - summary="true" - required="false" - type="boolean"/> - </c:map-property> - - </c:list-property> - - </resource-configuration> - - <help> - <![CDATA[ - <p>The message counter metrics will not be collected by default. In order - for these metrics to be collected for all Topics and Queues for a given application server instance, - go to the instance's JMX Console, and invoke the - <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean. - To ensure the message counters are still enabled when the application server is restarted, - edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the - <tt>EnableMessageCounters</tt> attribute to "true".</p> - ]]> - </help> - - </service> - - <service name="Topic" - class="JmsDestinationComponent" - createDeletePolicy="both" - subCategory="JMS Destinations" - discovery="JmsDestinationDiscoveryComponent"> - - <plugin-configuration> - <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/> - <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/> - <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true"> - <c:description> - The name of the Resource configuration property whose value should be used as the - underlying ManagedComponent name when creating a new Resource of this type. - </c:description> - </c:simple-property> - <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true"> - <c:simple-property name="jms-type" default="topic"/> - <c:map-property name="customProperties" - description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> - <c:simple-property name="securityConfig" - default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/> - </c:map-property> - </c:group> - </plugin-configuration> - - &destinationOperations; - - <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> - <c:simple-property required="false" name="arg#1" displayName="selector"/> - </parameters> - <results> - <c:notes>List all messages for the specified subscription with the specified selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> - <c:simple-property required="false" name="arg#1" displayName="selector"/> - </parameters> - <results> - <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector"> - <parameters> - <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> - <c:simple-property required="false" name="arg#1" displayName="selector"/> - </parameters> - <results> - <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes> - <c:list-property name="result"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="JMSCorrelationID"/> - <c:simple-property required="false" name="JMSMessageID"/> - <c:simple-property type="long" required="false" name="JMSTimestamp"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="listAllSubscriptions" displayName="List All Subscriptions" - description="Return all subscriptions for the topic"> - <results> - <c:notes>Return all subscriptions for the topic</c:notes> - &subscriptionsResultProperty; - </results> - </operation> - - <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML" - description="Return all subscriptions for the topic as HTML"> - <results> - <c:notes>Return all subscriptions for the topic as HTML</c:notes> - <c:simple-property name="result" type="longString"/> - </results> - </operation> - - <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions" - description="Return all durable subscriptions for the topic"> - <results> - <c:notes>Return all durable subscriptions for the topic</c:notes> - &subscriptionsResultProperty; - </results> - </operation> - - <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML" - description="Return all durable subscriptions for the topic as HTML"> - <results> - <c:notes>Return all durable subscriptions for the topic as HTML</c:notes> - <c:simple-property name="result" type="longString"/> - </results> - </operation> - - <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions" - description="Return all non-durable subscriptions for the topic"> - <results> - <c:notes>Return all non-durable subscriptions for the topic</c:notes> - &subscriptionsResultProperty; - </results> - </operation> - - <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML" - description="Return all non-durable subscriptions for the topic as HTML"> - <results> - <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes> - <c:simple-property name="result" type="longString"/> - </results> - </operation> - - &managedObjectMetrics; - -  - - <metric property="createdProgrammatically" displayType="summary" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" - description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/> - -  - <metric property="messageCounterHistoryDayLimit" - defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" - description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/> - -  - - <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all messages in all subscriptions to this topic"/> - - <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all subscriptions to this topic"/> - - <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all messages for all durable subscriptions to this topic"/> - - <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all durable subscriptions to this topic"/> - - <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all messages in all non durable subscriptions to this topic"/> - - <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" - defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" - description="The count of all non durable subscriptions to this topic"/> - - <resource-configuration> - -  - - <c:simple-property required="true" name="name" readOnly="true" - description="The name of this topic (e.g. 'MyTopic')."/> - - <c:simple-property required="true" name="JNDIName" readOnly="true" - description="This topic's JNDI name (e.g. '/topic/MyTopic')"/> - - <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false"> - <c:description> - Is this topic clustered? For an existing topic, this property is read-only. If not specified - when creating a new topic, the default value is false. - </c:description> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000"> - <c:description> - When paging messages to storage from a subscription, they first go into a "Down Cache" before - being written to storage. This enables the write to occur as a single operation, thus aiding - performance. This setting determines the maximum number of messages that the Down Cache will hold - before they are flushed to storage. - Updates to this property will not go into effect until the topic has been restarted. - The default value is 2000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000"> - <c:description> - The maximum number of messages held by the topic subscriptions in memory at any one time. - The actual subscription can hold many more messages than this, but these are paged to and from - storage as necessary, as messages are added or consumed. - Updates to this property will not go into effect until the topic has been restarted. - The default value is 200000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1"> - <c:description> - The number of delivery attempts before a message to a subscriber of this topic is moved to the - DLQ. The default value is 10. A value of -1 indicates the default value should be used. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1"> - <c:description> - The maximum number of messages this topic can hold before they are dropped. - A value of -1 means there is no maximum. The default value is -1. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000"> - <c:description> - When loading messages from a subscription, this is the maximum number of messages to - pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size. - Updates to this property will not go into effect until the topic has been restarted. - The default value is 2000. - </c:description> - <c:constraint> - <c:integer-constraint minimum="1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1"> - <c:description> - The delay in milliseconds before a rolled back or recovered message is redelivered. - Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used. - </c:description> - <c:constraint> - <c:integer-constraint minimum="-1"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="DLQ"> - <c:description> - The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g. - "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the - server peer. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="expiryQueue"> - <c:description> - The JMX ObjectName of the expiry queue for this topic (e.g. - "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default - expiry queue on the server peer. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:simple-property required="false" name="serverPeer"> - <c:description> - The JMX ObjectName of the server peer this topic was deployed on (e.g. - "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until - the topic has been restarted. - </c:description> - <c:constraint> - <c:regex-constraint expression="[^:]+:.+"/> - </c:constraint> - </c:simple-property> - - <c:list-property name="securityConfig" max="4" min="2" - displayName="Security Configurations" - description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute."> - <c:map-property name="role" - displayName="Security Configuration Attributes" - description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue"> - <c:simple-property name="name" - displayName="Name" - description="Name of the Security Role. e.g. Guest" - summary="true" - required="true"/> - <c:simple-property name="read" - displayName="Read" - description="Is this role allowed to read messages?" - summary="true" - required="false" - type="boolean"/> - <c:simple-property name="write" - displayName="Write" - description="Is this role allowed to write messages?" - summary="true" - required="false" - type="boolean"/> - <c:simple-property name="create" - displayName="Create" - description="Is this role allowed to create messages?" - summary="true" - required="false" - type="boolean"/> - </c:map-property> - </c:list-property> - - </resource-configuration> - - <help> - <![CDATA[ - <p>The message counter metrics will not be collected by default. In order - for these metrics to be collected for all Topics and Queues for a given application server instance, - go to the instance's JMX Console, and invoke the - <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean. - To ensure the message counters are still enabled when the application server is restarted, - edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the - <tt>EnableMessageCounters</tt> attribute to "true".</p> - ]]> - </help> - - </service> - - -  - - <service name="Enterprise Application (EAR)" - subCategory="Applications" - class="StandaloneManagedDeploymentComponent" - discovery="StandaloneManagedDeploymentDiscoveryComponent" - description="JEE enterprise application (EAR)" - createDeletePolicy="both" - creationDataType="content"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="ear" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="Enterprise Application" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEApplication" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <operation name="start" - description="starts this EAR"/> - - <operation name="stop" - description="stops this EAR"/> - - <operation name="restart" - description="stops and then restarts this EAR"/> - - <metric property="custom.path" displayName="Path" - dataType="trait" displayType="summary" - description="the absolute path of this EAR file or directory"/> - - <metric property="custom.exploded" displayName="Exploded?" - dataType="trait" displayType="summary" - description="whether this EAR is deployed exploded (i.e. as a directory)"/> - - <content name="file" displayName="EAR File" category="deployable" isCreationType="true"> - &deploymentContentConfigProps; - </content> - - </service> - - <service name="Web Application (WAR)" - subCategory="Applications" - class="StandaloneManagedDeploymentComponent" - discovery="StandaloneManagedDeploymentDiscoveryComponent" - description="a standalone web application (WAR)" - createDeletePolicy="both" - creationDataType="content"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="war" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="a standalone web application (WAR)" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <operation name="start" - description="starts this WAR"/> - - <operation name="stop" - description="stops this WAR"/> - - <operation name="restart" - description="stops and then restarts this WAR"/> - - <metric property="custom.path" displayName="Path" - dataType="trait" displayType="summary" - description="the absolute path of this WAR file or directory"/> - - <metric property="custom.exploded" displayName="Exploded?" - dataType="trait" displayType="summary" - description="whether this WAR is deployed exploded (i.e. as a directory)"/> - - &webApplicationMetrics; - - <content name="file" displayName="WAR File" category="deployable" isCreationType="true"> - &deploymentContentConfigProps; - </content> - - <service name="Web Application Context" - class="WebApplicationContextComponent" - discovery="WebApplicationContextDiscoveryComponent" - description="a web application context"> - - <plugin-configuration> - <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/> - <c:group name="advanced"> - <c:simple-property name="componentType" default="MBean" readOnly="true"/> - <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </c:group> - <c:group name="ResponseTime"> - <c:simple-property name="responseTimeLogFile" required="false" - description="the full path to the log file containing response-time stats for this webapp"/> - <c:simple-property name="responseTimeUrlExcludes" required="false" - description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> - <c:simple-property name="responseTimeUrlTransforms" required="false" - description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> - </c:group> - </plugin-configuration> - - &webApplicationContextMetrics; - </service> - - </service> - - <service name="Embedded Web Application (WAR)" - subCategory="Applications" - class="EmbeddedManagedDeploymentComponent" - discovery="EmbeddedManagedDeploymentDiscoveryComponent" - description="an embedded web application (WAR)"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> - <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/> - </c:group> - <c:group name="ResponseTime"> - <c:simple-property name="responseTimeLogFile" required="false" - description="the full path to the log file containing response-time stats for this webapp"/> - <c:simple-property name="responseTimeUrlExcludes" required="false" - description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> - <c:simple-property name="responseTimeUrlTransforms" required="false" - description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="war" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="an embedded web application (WAR)" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - <c:simple-property name="embedded" default="JavaEEWebApplication" readOnly="true"/> - </c:group> - </plugin-configuration> - - <metric property="custom.parent" displayName="Parent" - dataType="trait" displayType="summary" - description="the name of this WAR's parent deployment"/> - - &webApplicationMetrics; - - <service name="Embedded Web Application Context" - class="WebApplicationContextComponent" - discovery="WebApplicationContextDiscoveryComponent" - description="a web application context"> - - <plugin-configuration> - <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/> - <c:group name="advanced"> - <c:simple-property name="componentType" default="MBean" readOnly="true"/> - <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </c:group> - <c:group name="ResponseTime"> - <c:simple-property name="responseTimeLogFile" required="false" - description="the full path to the log file containing response-time stats for this webapp"/> - <c:simple-property name="responseTimeUrlExcludes" required="false" - description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> - <c:simple-property name="responseTimeUrlTransforms" required="false" - description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> - </c:group> - </plugin-configuration> - - &webApplicationContextMetrics; - </service> - - </service> - - <service name="EJB2 JAR" - subCategory="Applications" - class="StandaloneManagedDeploymentComponent" - discovery="StandaloneManagedDeploymentDiscoveryComponent" - description="a standalone EJB 2.x application" - createDeletePolicy="both" - creationDataType="content"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="jar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="a standalone EJB 2.x application" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <operation name="start" - description="starts this EJB JAR"/> - - <operation name="stop" - description="stops this EJB JAR"/> - - <operation name="restart" - description="stops and then restarts this EJB JAR"/> - - <metric property="custom.path" displayName="Path" - dataType="trait" displayType="summary" - description="the absolute path of this EJB JAR file or directory"/> - - <metric property="custom.exploded" displayName="Exploded?" - dataType="trait" displayType="summary" - description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/> - - <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true"> - &deploymentContentConfigProps; - </content> - - <service name="EJB2 Stateless Session Bean" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Stateless Session Bean"> - &ejb2StatelessSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2SessionBeanMetrics; - &ejb2StatelessSessionBeanMetrics; - - <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" - description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> - </service> - - <service name="EJB2 Stateful Session Bean" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Stateful Session Bean"> - &ejb2StatefulSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2SessionBeanMetrics; - &ejb2StatefulSessionBeanMetrics; - - <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" - defaultOn="false" defaultInterval="600000" destinationType="Method Name" - description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> - </service> - - <service name="EJB2 Message-Driven Bean" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Message Driven Bean"> - &ejb2MessageDrivenBeanDefinition; - &ejb2PoolMetrics; - &ejb2MessageDrivenBeanMetrics; - </service> - - <service name="EJB2 Entity Bean" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Entity Bean"> - &ejb2EntityBeanDefinition; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2EntityBeanMetrics; - </service> - </service> - - <service name="Embedded EJB2 JAR" - subCategory="Applications" - class="EmbeddedManagedDeploymentComponent" - discovery="EmbeddedManagedDeploymentDiscoveryComponent" - description="an embedded EJB 2.x application"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="jar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="an embedded EJB 2.x application" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <metric property="custom.parent" displayName="Parent" - dataType="trait" displayType="summary" - description="the name of this EJB JAR's parent deployment"/> - - <service name="EJB2 Stateless Session Bean (Embedded)" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Stateless Session Bean"> - &ejb2StatelessSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2SessionBeanMetrics; - &ejb2StatelessSessionBeanMetrics; - </service> - - <service name="EJB2 Stateful Session Bean (Embedded)" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Stateful Session Bean"> - &ejb2StatefulSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2SessionBeanMetrics; - &ejb2StatefulSessionBeanMetrics; - </service> - - <service name="EJB2 Message-Driven Bean (Embedded)" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Message Driven Bean"> - &ejb2MessageDrivenBeanDefinition; - &ejb2PoolMetrics; - &ejb2MessageDrivenBeanMetrics; - </service> - - <service name="EJB2 Entity Bean (Embedded)" - class="Ejb2BeanComponent" - discovery="Ejb2BeanDiscoveryComponent" - description="An EJB2 Entity Bean"> - &ejb2EntityBeanDefinition; - &ejb2CreateRemoveMetrics; - &ejb2PoolMetrics; - &ejb2EntityBeanMetrics; - </service> - </service> - - <service name="EJB3 JAR" - subCategory="Applications" - class="StandaloneManagedDeploymentComponent" - discovery="StandaloneManagedDeploymentDiscoveryComponent" - description="a standalone EJB 3.x application" - createDeletePolicy="both" - creationDataType="content"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="jar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="a standalone EJB 3.x application" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <operation name="start" - description="starts this EJB JAR"/> - - <operation name="stop" - description="stops this EJB JAR"/> - - <operation name="restart" - description="stops and then restarts this EJB JAR"/> - - <metric property="custom.path" displayName="Path" - dataType="trait" displayType="summary" - description="the absolute path of this EJB JAR file or directory"/> - - <metric property="custom.exploded" displayName="Exploded?" - dataType="trait" displayType="summary" - description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/> - - <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true"> - &deploymentContentConfigProps; - </content> - - <service name="EJB3 Stateless Session Bean" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Stateless Session Bean (SLSB)"> - &ejb3StatelessSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3SessionBeanMetrics; - </service> - - <service name="EJB3 Stateful Session Bean" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Stateful Session Bean (SFSB)"> - &ejb3StatefulSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3SessionBeanMetrics; - &ejb3StatefulSessionBeanMetrics; - </service> - - <service name="EJB3 Message-Driven Bean" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Message-Driven Bean (MDB)"> - &ejb3MessageDrivenBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3MessageDrivenBeanMetrics; - </service> - - </service> - - <service name="Embedded EJB3 JAR" - subCategory="Applications" - class="EmbeddedManagedDeploymentComponent" - discovery="EmbeddedManagedDeploymentDiscoveryComponent" - description="an embedded EJB 3.x application"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="jar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="an embedded EJB 3.x application" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <metric property="custom.parent" displayName="Parent" - dataType="trait" displayType="summary" - description="the name of this EJB JAR's parent deployment"/> - - <service name="EJB3 Stateless Session Bean (Embedded)" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Stateless Session Bean (SLSB)"> - &ejb3StatelessSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3SessionBeanMetrics; - </service> - - <service name="EJB3 Stateful Session Bean (Embedded)" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Stateful Session Bean (SFSB)"> - &ejb3StatefulSessionBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3SessionBeanMetrics; - &ejb3StatefulSessionBeanMetrics; - </service> - - <service name="EJB3 Message-Driven Bean (Embedded)" - class="Ejb3BeanComponent" - discovery="Ejb3BeanDiscoveryComponent" - description="An EJB3 Message-Driven Bean (MDB)"> - &ejb3MessageDrivenBeanDefinition; - &ejbInvocationStatsOperation; - &ejb3CommonMetrics; - &ejb3MessageDrivenBeanMetrics; - </service> - - </service> - - <service name="Resource Adapter Archive (RAR)" - subCategory="Applications" - class="StandaloneManagedDeploymentComponent" - discovery="StandaloneManagedDeploymentDiscoveryComponent" - description="a standalone JCA resource adapter archive (RAR)" - createDeletePolicy="both" - creationDataType="content"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="rar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="a standalone resource adapter" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <operation name="start" - description="starts this RAR"/> - - <operation name="stop" - description="stops this RAR"/> - - <operation name="restart" - description="stops and then restarts this RAR"/> - - <metric property="custom.path" displayName="Path" - dataType="trait" displayType="summary" - description="the absolute path of this RAR file or directory"/> - - <metric property="custom.exploded" displayName="Exploded?" - dataType="trait" displayType="summary" - description="whether this RAR is deployed exploded (i.e. as a directory)"/> - - <content name="file" displayName="RAR File" category="deployable" isCreationType="true"> - &deploymentContentConfigProps; - </content> - - </service> - - <service name="Embedded Resource Adapter Archive (RAR)" - subCategory="Applications" - class="EmbeddedManagedDeploymentComponent" - discovery="EmbeddedManagedDeploymentDiscoveryComponent" - description="an embedded JCA resource adapter archive (RAR)"> - - <plugin-configuration> - <c:group name="general" displayName="General"> - <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> - <c:simple-property name="filename" readOnly="true"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="extension" default="rar" readOnly="true"/> - <c:simple-property name="descriptionTemplate" default="an embedded resource adapter" readOnly="true"/> - <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true"> - <c:description> - The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum - corresponding to this deployment's type. - </c:description> - </c:simple-property> - </c:group> - </plugin-configuration> - - <metric property="custom.parent" displayName="Parent" - dataType="trait" displayType="summary" - description="the name of this RAR's parent deployment"/> - - </service> - - <service name="Script" - discovery="org.rhq.plugins.jbossas5.script.ScriptDiscoveryComponent" - class="org.rhq.plugins.jbossas5.script.ScriptComponent" - supportsManualAdd="true" - subCategory="Resources" - description="provides the ability to execute a script that performs some task related to its parent JBossAS server"> - - <plugin-configuration> - <c:simple-property name="path" description="the absolute path to the script file"/> - <c:simple-property name="environmentVariables" type="longString" required="false" - description="the environment variables that will be passed to the script; each variable must - be on a new line and have the syntax name=value; the variable's value can contain properties - with the syntax %propertyName%; the script plugin will interpolate these with - the current values of the corresponding properties from the - script's parent JBossAS server's connection properties"/> - </plugin-configuration> - - <operation name="execute" displayName="Execute Script" - description="execute the script; NOTE: environment variables to be - passed to the script can be configured via this Script - service's connection properties (under its Inventory tab)"> - <parameters> - <c:simple-property name="commandLineArguments" type="longString" required="false" - description="the command-line arguments (if any) to pass to the script; each - command-line argument must be on a new line; - the arguments can contain properties - with the syntax %propertyName%; the script plugin will interpolate these with - the current values of the corresponding properties from the - script's parent JBossAS server's connection properties"/> - </parameters> - <results> - <c:simple-property name="exitCode" type="integer" description="the script's exit code (0 indicates success, any other value indicates failure)"/> - <c:simple-property name="output" type="longString" description="the script's output (stdout and stderr interleaved)"/> - </results> - </operation> - - </service> - - <service name="Service Binding Manager" - class="org.rhq.plugins.jbossas5.serviceBinding.ManagerComponent" - discovery="org.rhq.plugins.jbossas5.serviceBinding.ManagerDiscoveryComponent" - description="The Service Binding Manager manages the ports of the deployed services" - singleton="true"> - - <plugin-configuration> - <c:simple-property name="componentType" default="MCBean" readOnly="true"/> - <c:simple-property name="componentSubtype" default="ServiceBindingManager" readOnly="true"/> - <c:simple-property name="componentName" readOnly="true"/> - </plugin-configuration> - - <metric property="activeBindingSetName" dataType="trait" displayName="Active Binding Set" - displayType="summary" description="The active binding set used to obtain port bindings from." /> - - <resource-configuration> - <c:simple-property name="activeBindingSetName" - activationPolicy="restart"> - <c:description><![CDATA[ -The name of the binding set the Service Binding Manager should use when resolving bindings. -Note to JBoss ON or Jopr users (does not apply to JBoss AS admin console): -CHANGING THIS PROPERTY IS POTENTIALLY DANGEROUS because if there are any port conflicts -on the machine the Application Server is running on, the server will not start up again and -it will not be possible to monitor it. -To be able to monitor the server again after the restart you have to update the "Naming Provider Url" -in the "Connection" subtab in the "Inventory" of the Application Server to the value -of "jboss:service=Naming:Port" binding of the active binding set. -I.e. if the "jboss:service=Naming:Port" binding of the active binding set has the port set to 4099 and hostname to 127.0.0.1, -you have to set the "Naming Provider Url" to jnp://127.0.0.1:4099. - ]]></c:description> - </c:simple-property> - <c:list-property name="standardBindings" description="The standard port bindings inherited by the binding sets."> - <c:map-property name="binding"> - <c:simple-property name="serviceName" description="The name of the service to which this binding applies."/> - <c:simple-property name="bindingName" required="false" description="A qualifier identifying which particular binding within the service this is."/> - <c:simple-property name="port" type="integer" description="The port to use for the binding."> - <c:constraint> - <c:integer-constraint minimum="0"/> - <c:integer-constraint maximum="65535"/> - </c:constraint> - </c:simple-property> - <c:simple-property name="hostname" required="false" description="The host name or string notation IP address to use for the binding."/> - <c:simple-property name="description" required="false" description="Description of the binding."/> - <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> - <c:simple-property name="fixedHostName" type="boolean" description="Whether the host name should remain fixed in all binding sets."/> - <c:simple-property name="fixedPort" type="boolean" description="Whether the port should remain fixed in all binding sets."/> - </c:map-property> - </c:list-property> - </resource-configuration> - - <service name="Service Binding Set" - class="org.rhq.plugins.jbossas5.serviceBinding.SetComponent" - discovery="org.rhq.plugins.jbossas5.serviceBinding.SetDiscoveryComponent" - description="The Service Binding Set defines all bindings of a profile. It inherits the standard bindings from the Service Binding Manager and defines a port offset and overridden and additional bindings." createDeletePolicy="both"> - - <operation name="displayBindings" displayName="Display Bindings" description="Displays the full set of bindings as they would look if this bindings set was active."> - <results> - <c:list-property name="resultingBindings" readOnly="true" required="false" displayName="Resulting Bindings" - description="In this list you can review the resulting bindings of this binding set. This list includes the override bindings defined for this binding set and the standard bindings as they would look if this binding set was active (i.e. the port offset and default host name applied where appropriate)."> - <c:map-property name="binding" readOnly="true"> - <c:simple-property readOnly="true" name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/> - <c:simple-property readOnly="true" name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/> - <c:simple-property readOnly="true" name="port" type="integer" displayName="Port" description="The port to use for the binding."/> - <c:simple-property readOnly="true" name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/> - <c:simple-property readOnly="true" name="description" required="false" displayName="Description" description="Description of the binding"/> - <c:simple-property readOnly="true" name="fullyQualifiedName" required="false" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <metric property="name" displayName="Name" dataType="trait" displayType="summary" description="The name of this binding set."/> - <metric property="defaultHostName" dataType="trait" displayName="Default Host Name" displayType="summary" description="The default host name of this binding set." /> - <metric property="portOffset" dataType="trait" displayName="Port Offset" displayType="summary" description="The port offset of this binding set."/> - - <resource-configuration> - <c:simple-property name="name" readOnly="true" description="The name of this binding set."/> - <c:simple-property name="defaultHostName" description='The host name that should be used for all bindings whose configuration does not specify "fixed host name".'/> - <c:simple-property name="portOffset" type="integer" description="A value to add to the port configuration for a standard binding to derive the port to use in this binding set. This doesn't apply to standard bindings defined as 'fixed port'."> - <c:constraint> - <c:integer-constraint minimum="0"/> - <c:integer-constraint maximum="65535"/> - </c:constraint> - </c:simple-property> - <c:list-property name="overrideBindings" description='The binding configurations that apply only to this binding set, either non-standard bindings or ones that override standard binding configurations. - The binding set inherits the standard bindings from the Service Binding Manager, applies the port offset to them (unless the standard binding is defined as "fixed port"), and appends the override - bindings. These can either redefine a standard binding or define a brand new binding. The standard bindings and the override bindings then define the - full set of the bindings that are defined by the binding set.'> - <c:map-property name="binding"> - <c:simple-property name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/> - <c:simple-property name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/> - <c:simple-property name="port" type="integer" displayName="Port" description="The port to use for the binding."> - <c:constraint> - <c:integer-constraint minimum="0"/> - <c:integer-constraint maximum="65535"/> - </c:constraint> - </c:simple-property> - <c:simple-property name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/> - <c:simple-property name="description" required="false" displayName="Description" description="Description of the binding"/> - <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> - </c:map-property> - </c:list-property> - </resource-configuration> - </service> - </service> - - </server> - -</plugin> +<?xml version="1.0" encoding="UTF-8" ?> + +<!DOCTYPE plugin [ + +<!ENTITY managedObjectMetrics ' + <metric property="runState" displayType="summary" + defaultOn="true" defaultInterval="30000" dataType="trait" category="performance"/> +'> + +<!ENTITY datasourceAndConnectionFactoryOperations ' + <operation name="flush" displayName="Flush" + description="Flush the connections in the pool"/> + + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted sub pool statistics report"> + <parameters> + <c:simple-property required="false" name="formatClassName" + defaultValue="org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter"> + <c:description> + The fully qualified name of the Java class to use to format the the sub pool statistics. The default + is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter". + </c:description> + </c:simple-property> + </parameters> + <results> + <c:simple-property name="result" type="longString"> + <c:description> + A formatted sub pool statistics report. + </c:description> + </c:simple-property> + </results> + </operation> + + <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report"> + <results> + <c:map-property name="result"/> + </results> + </operation> + + <operation name="testConnection" displayName="Test Connection" description="Test if a connection can be obtained"> + <results> + <c:notes>Test if a connection can be obtained</c:notes> + <c:simple-property type="boolean" name="result" description="Was a connection obtained?"/> + </results> + </operation> +'> + + +<!ENTITY datasourceMetrics ' +  + <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" + defaultOn="true" defaultInterval="60000" dataType="trait" category="performance" + description="the JNDI name of the connection pool for this datasource"/> + +  + <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the maximum number of connections that are available"/> + + <metric property="connectionCount" measurementType="dynamic" displayType="summary" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the number of connections that are currently in the pool"/> + + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the number of connections that have been created since the datasource was last started"/> + + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the number of connections that have been destroyed since the datasource was last started"/> + + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the number of connections that are currently in use"/> + + <metric property="local-transaction" displayType="summary" + defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance" + description="the most connections that have been simultaneously in use since this datasource was started"/> + + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> +'> + + + +<!ENTITY datasourceAndConnectionFactoryConnectionResourceConfigProps ' + <c:simple-property name="min-pool-size" + displayName="Minimum Pool Size" + type="integer" + required="false" + defaultValue="0"> + <c:description> + The minimum number of connections the pool should hold. The default is 0. + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + + <c:simple-property name="max-pool-size" + displayName="Maximum Pool Size" + type="integer" + required="false" + defaultValue="10"> + <c:description> + The maximum number of connections the pool should hold. The default is 10. + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> +'> + +<!ENTITY datasourceConnectionResourceConfigProps ' + <c:simple-property name="jndi-name" + displayName="JNDI Name" + description="The global JNDI Name under which to bind the datasource" + type="string"/> + + <c:simple-property name="user-name" + displayName="Username" + description="The default username when creating a new connection." + type="string" + activationPolicy="immediate" + required="false"/> + + <c:simple-property name="password" + displayName="Password" + description="The default password when creating a new connection." + type="password" + activationPolicy="immediate" + required="false"/> +'> + +<!ENTITY datasourceAndConnectionFactoryAdvancedResourceConfigProps ' + <c:simple-property name="allocation-retry" type="integer" required="false" + defaultValue="0"> + <c:description> + The number of times that allocating a connection should be tried before throwing an exception. The default + is 0. + </c:description> + </c:simple-property> + + <c:simple-property name="allocation-retry-wait-millis" type="long" required="false" units="milliseconds" + defaultValue="5000"> + <c:description> + The time in milliseconds to wait between retrying to allocate a connection. The default is 5000 (5 seconds). + </c:description> + </c:simple-property> + + <c:simple-property name="background-validation" type="boolean" required="false" defaultValue="false"> + <c:description> + Specify if connections should be validated on a background thread versus being validated + prior to use. Background validation is meant to reduce the overall load on the RDBMS system when validating + a connection. The default is No. + </c:description> + </c:simple-property> + + <c:simple-property name="background-validation-millis" type="long" required="false" units="milliseconds" + defaultValue="0"> + <c:description> + The interval, in milliseconds, at which the ConnectionValidator will run. Set to 0 to disable background + validation. The default is 0. + </c:description> + </c:simple-property> + + <c:simple-property name="blocking-timeout-millis" displayName="Blocking Timeout in Milliseconds" + units="milliseconds" defaultValue="30000" + type="integer" required="false"> + <c:description> + Indicates the maximum time in milliseconds to block while waiting for a connection before throwing + an exception. Note that this blocks only while waiting for a permit for a connection, and will never + throw an exception if creating a new connection takes an inordinately long time. The default is 30000 + (30 seconds). + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + + <c:simple-property name="idle-timeout-minutes" type="integer" activationPolicy="immediate" + displayName="Idle Timeout" units="minutes" required="false" defaultValue="30"> + <c:description> + The maximum time, in minutes, a connection may be idle before being closed. The default is 30. + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + + <c:simple-property name="isSameRM-override-value" type="boolean" required="false"> + <c:description> + If set, unconditionally sets the boolean return value of javax.transaction.xa.XAResource.isSameRM(XAResource). + </c:description> + </c:simple-property> + + <c:simple-property name="jmx-invoker-name" required="false"> + <c:description> + The ObjectName of the JMX Invoker MBean associated with this datasource. + </c:description> + </c:simple-property> + + <c:map-property name="metadata" required="false" description="Metadata properties."> + <c:simple-property required="false" name="typeMapping"> + <c:description> + The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. + </c:description> + <c:property-options> + <c:option name="Cloudscape" value="Cloudscape"/> + <c:option name="DB2" value="DB2"/> + <c:option name="DB2/400" value="DB2/400"/> + <c:option name="Derby" value="Derby"/> + <c:option name="Firebird" value="Firebird"/> + <c:option name="FirstSQL/J" value="FirstSQL/J"/> + <c:option name="Hypersonic SQL" value="Hypersonic SQL"/> + <c:option name="InformixDB" value="InformixDB"/> + <c:option name="Ingres" value="Ingres"/> + <c:option name="InterBase" value="InterBase"/> + <c:option name="MaxDB" value="MaxDB"/> + <c:option name="McKoi" value="McKoi"/> + <c:option name="Mimer SQL" value="Mimer SQL"/> + <c:option name="MS SQLSERVER" value="MS SQLSERVER"/> + <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/> + <c:option name="Oracle7" value="Oracle7"/> + <c:option name="Oracle8" value="Oracle8"/> + <c:option name="Oracle9i" value="Oracle9i"/> + <c:option name="PointBase" value="PointBase"/> + <c:option name="PostgreSQL" value="PostgreSQL"/> + <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/> + <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/> + <c:option name="SapDB" value="SapDB"/> + <c:option name="SOLID" value="SOLID"/> + <c:option name="Sybase" value="Sybase"/> + </c:property-options> + </c:simple-property> + </c:map-property> + + <c:simple-property name="no-tx-separate-pools" type="boolean" + displayName="No Tx Separate Pools" required="false"> + <c:description> + If true, the datasource cannot reuse a connection outside a transaction once enlisted in a global transaction + and vice-versa. The default is Yes. + </c:description> + </c:simple-property> + + <c:simple-property name="prefill" type="boolean" required="false"> + <c:description> + Whether to attempt to prefill the connection pool to the minimum number of connections. NOTE: Only + supporting pools (OnePool) support this feature. A warning can be found in the logs if the pool does not + support this. The default is No. + </c:description> + </c:simple-property> + + <c:map-property name="security-domain" displayName="Security Settings" required="false"> + <c:description> + Security settings for connections in the pool. + </c:description> + + <c:simple-property name="securityDeploymentType" type="string" + required="false" defaultValue="NONE"> + <c:description> + Indicates whether Subject (from security domain), application-supplied parameters + (such as from getConnection(user, pw)), both Subject and app-supplied parameters, + or neither Subject nor app-supplied parameters are used to distinguish connections + in the pool. The default is "NONE". + </c:description> + <c:property-options> + <c:option name="None" value="NONE"/> + <c:option name="Application" value="APPLICATION"/> + <c:option name="Domain" value="DOMAIN"/> + <c:option name="Domain and Application" value="DOMAIN_AND_APPLICATION"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="domain" type="string" + required="false"> + <c:description> + The name of the JAAS security manager that will handle authentication (only required if security + deployment type is DOMAIN or DOMAIN_AND_APPLICATION). This name correlates to the JAAS login-config.xml + descriptor application-policy/name attribute. + </c:description> + </c:simple-property> + </c:map-property> + + <c:simple-property name="statistics-formatter" required="false"> + <c:description> + The fully qualified class name of the class to use for formatting managed connection pool statistics for + this datasource. The class must implement the org.jboss.resource.statistic.formatter.StatisticsFormatter. + interface. The default is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter". + </c:description> + </c:simple-property> + + <c:simple-property name="type-mapping" displayName="Type Mapping" required="false"> + <c:description> + The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml. + </c:description> + <c:property-options> + <c:option name="Cloudscape" value="Cloudscape"/> + <c:option name="DB2" value="DB2"/> + <c:option name="DB2/400" value="DB2/400"/> + <c:option name="Derby" value="Derby"/> + <c:option name="Firebird" value="Firebird"/> + <c:option name="FirstSQL/J" value="FirstSQL/J"/> + <c:option name="Hypersonic SQL" value="Hypersonic SQL"/> + <c:option name="InformixDB" value="InformixDB"/> + <c:option name="Ingres" value="Ingres"/> + <c:option name="InterBase" value="InterBase"/> + <c:option name="MaxDB" value="MaxDB"/> + <c:option name="McKoi" value="McKoi"/> + <c:option name="Mimer SQL" value="Mimer SQL"/> + <c:option name="MS SQLSERVER" value="MS SQLSERVER"/> + <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/> + <c:option name="Oracle7" value="Oracle7"/> + <c:option name="Oracle8" value="Oracle8"/> + <c:option name="Oracle9i" value="Oracle9i"/> + <c:option name="PointBase" value="PointBase"/> + <c:option name="PostgreSQL" value="PostgreSQL"/> + <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/> + <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/> + <c:option name="SapDB" value="SapDB"/> + <c:option name="SOLID" value="SOLID"/> + <c:option name="Sybase" value="Sybase"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="use-java-context" + displayName="Use Java Context" + type="boolean" defaultValue="true" + required="false"> + <c:description> + Indicates whether the JNDI name should be bound under the "java" context, + which causes the DataSource to only be accessible from within the JBossAS VM. + The default is Yes. + </c:description> + </c:simple-property> + + <c:simple-property name="use-strict-min" type="boolean" required="false"> + <c:description> + Whether idle connections below the min-pool-size should be closed. The default is No. + </c:description> + </c:simple-property> + + <c:simple-property name="validate-on-match" type="boolean" required="false" defaultValue="true"> + <c:description> + The validate-on-match element indicates whether or not connection level validation should be done when a + connection factory attempts to match a managed connection for a given set. This is typically exclusive to + the use of background validation. The default is Yes. + </c:description> + </c:simple-property> +'> + +<!ENTITY datasourceAdvancedResourceConfigProps ' + <c:simple-property name="check-valid-connection-sql" type="longString" + displayName="Check Valid Connection SQL" required="false"> + <c:description>The SQL statement to use to check the validity of a pool connection.</c:description> + </c:simple-property> + + <c:simple-property required="false" name="connection-definition"> + <c:description> + The connection definition inside the RAR deployment uniquely identified by the connection factory interface, + e.g. "javax.sql.DataSource". + </c:description> + </c:simple-property> + + <c:simple-property name="exception-sorter-class-name" type="string" activationPolicy="immediate" + displayName="Exception Sorter Class Name" required="false"> + <c:description> + The fully qualified name of a Java class implementing the org.jboss.resource.adapter.jdbc.ExceptionSorter + interface that should be used to check if a JDBC exception should be broadcast. + </c:description> + </c:simple-property> + + <c:simple-property name="new-connection-sql" type="longString" activationPolicy="immediate" + displayName="New Connection SQL" required="false"> + <c:description> + An SQL statement to execute whenever a new connection is added to the pool; this can be used to set the + connection schema, etc. + </c:description> + </c:simple-property> + + <c:simple-property name="prepared-statement-cache-size" type="integer" + displayName="Prepared Statement Cache Size" required="false" defaultValue="0"> + <c:description> + The number of prepared statements per connection to be kept open and reused in subsequent requests. They are + stored in an LRU cache. Set to 0 to disable the cache. The default is 0. + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + + <c:simple-property name="query-timeout" + displayName="Query Timeout" + type="integer" + units="seconds" + required="false"> + <c:description> + Any configured query timeout in seconds. A value of 0 means no timeout. The default is 0. + </c:description> + </c:simple-property> + + <c:simple-property name="rar-name" required="false"> + <c:description> + The RAR deployment to associate with the connection manager MBean. e.g. jms-ra.rar or + myapplication.ear#my.rar for nested rars. + </c:description> + </c:simple-property> + + <c:simple-property name="set-tx-query-timeout" + displayName="Set Tx Query Timeout" + type="boolean" + required="false" + defaultValue="false"> + <c:description> + Whether to set the query timeout based on the time remaining until transaction timeout; + any configured query timeout will be used if there is no transaction. The default is No. + </c:description> + </c:simple-property> + + <c:simple-property name="share-prepared-statements" displayName="Share Prepared Statements" + type="boolean" + required="false" defaultValue="false"> + <c:description> + Should prepared statements be shared? The default is No. + </c:description> + </c:simple-property> + + <c:simple-property name="stale-connection-checker-class-name" + displayName="Stale Connection Checker Class Name" + type="string" + required="false"> + <c:description> + Fully qualified name of the Java class used to check if a connection has become stale. + </c:description> + </c:simple-property> + + <c:simple-property name="track-statements" type="string" + displayName="Track Statements" required="false"> + <c:description> + Whether to check for unclosed Statements and ResultSets when connections are returned to the pool. The + default is "yes-no-warnings". + </c:description> + <c:property-options> + <c:option name="No" value="no"/> + <c:option name="Yes" value="yes"/> + <c:option name="Yes, but no warnings" value="yes-no-warnings" default="true"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="transaction-isolation" required="false" + description="The Transaction Isolation level. The default setting is to use whichever isolation level is provided by default by the database."> + <c:property-options> + <c:option value="TRANSACTION_READ_UNCOMMITTED" name="Read Uncommitted"/> + <c:option value="TRANSACTION_READ_COMMITTED" default="true" name="Read Committed"/> + <c:option value="TRANSACTION_REPEATABLE_READ" name="Repeatable Read"/> + <c:option value="TRANSACTION_SERIALIZABLE" name="Serializable"/> + <c:option value="TRANSACTION_NONE" name="None"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="url-delimiter" required="false" default="|"> + <c:description> + Specifies the delimiter for URLs in the value of the connection-url property for HA datasources. + The default is "|". + </c:description> + </c:simple-property> + + <c:simple-property name="url-selector-strategy-class-name" required="false"> + <c:description> + The fully qualified class name of a Java class implementing the + org.jboss.resource.adapter.jdbc.URLSelectorStrategy interface. + </c:description> + </c:simple-property> + + <c:simple-property name="use-try-lock" type="long" required="false" defaultValue="0"> + <c:description> + Any configured timeout, in milliseconds, for internal locks on the resource adapter objects. A value of 0 + means no timeout. The default is 0. + </c:description> + </c:simple-property> + + <c:simple-property name="valid-connection-checker-class-name" type="string" + displayName="Valid Connection Checker Class Name" required="false"> + <c:description> + The fully qualified name of a Java class implementing the + org.jboss.resource.adapter.jdbc.ValidConnectionChecker whose pingDatabase method should be used to check if + a connection is still valid before handing it out from the pool. + </c:description> + </c:simple-property> +'> + +<!ENTITY nonXaDatasourceConnectionResourceConfigProps ' + <c:simple-property name="driver-class" + displayName="JDBC Driver Class" + type="string"> + <c:description> + The fully qualified name of the JDBC driver class (e.g. "oracle.jdbc.driver.OracleDriver"). + </c:description> + </c:simple-property> + + <c:simple-property name="connection-url" + displayName="Connection URL" + type="string"> + <c:description> + The JDBC URL for the database (e.g. "jdbc:oracle:thin:@host.example.com:1521:db"). To define a high + availablity (HA) datasource, specify a list of URLs separated by URL delimiters + (e.g. "jdbc:oracle:thin:@host1.example.com:1521:db1|jdbc:oracle:thin:@host2.example.com:1521:db2"). + </c:description> + </c:simple-property> + + <c:map-property name="connection-properties" required="false" + description="Arbitrary connection properties that should be passed to the java.sql.Driver.connect(url, props) method."/> +'> + +<!ENTITY nonXaDatasourceOracleTemplateProps ' + <c:simple-property name="driver-class" default="oracle.jdbc.driver.OracleDriver"/> + <c:simple-property name="connection-url" default="jdbc:oracle:oci:@youroracle-tns-name"/> + <c:simple-property name="exception-sorter-class-name" + default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/> + <c:simple-property name="check-valid-connection-sql" default="SELECT * FROM DUAL"/> + <c:simple-property name="type-mapping" default="oracle.jdbc.driver.OracleDriver"/> + <c:simple-property name="use-try-lock" default="60000"/> + <c:map-property name="metadata"> + <c:simple-property name="typeMapping" default="Oracle9i"/> + </c:map-property> + <c:simple-property name="type-mapping" default="Oracle9i"/> +'> + + + +<!ENTITY connectionFactoryConnectionResourceConfigProps ' + <c:simple-property required="true" name="jndi-name" displayName="JNDI Name" + description="The global JNDI name to bind the connection factory under."/> + + <c:simple-property required="true" name="rar-name" displayName="RAR Name"> + <c:description> + The name of the RAR file that contains the definition for the resource we want to provide. For nested RAR + files, the name would look like myapplication.ear#my.rar. + </c:description> + </c:simple-property> + + <c:simple-property required="true" name="connection-definition"> + <c:description> + The connection factory interface class. It should match the connectionfactory-interface in the ra.xml file. + </c:description> + </c:simple-property> + +'> + + +<!ENTITY connectionFactoryAdvancedResourceConfigProps ' + <c:list-property required="false" name="config-property"> + <c:description> + Properties to supply to the ManagedConnectionFactory (MCF) MBean service configuration. + </c:description> + <c:map-property name="config-property"> + <c:simple-property name="name" description="The name of the configuration property." /> + <c:simple-property name="type" description="The type of the configuration property."> + <c:property-options> + <c:option value="java.lang.String" default="true"/> + <c:option value="java.lang.Boolean"/> + <c:option value="java.lang.Integer"/> + <c:option value="java.lang.Double"/> + <c:option value="java.lang.Byte"/> + <c:option value="java.lang.Short"/> + <c:option value="java.lang.Long"/> + <c:option value="java.lang.Float"/> + <c:option value="java.lang.Character"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="value" required="false" description="The value of the configuration property." /> + </c:map-property> + </c:list-property> +'> + +<!ENTITY connectionFactoryMetrics ' +  + <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + +  + <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary" + displayName="Available Connection Count" description="Number of available connections." + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="connectionCount" measurementType="dynamic" displayType="summary" + displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" + displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" + dataType="measurement" category="performance"/> + + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" + displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" + dataType="measurement" category="performance"/> + + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" + displayName="In Use Connection Count" description="Mumber of connections currently in use." + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" + displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use." + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> +'> + + +<!ENTITY destinationOperations ' + <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages from the destination."/> + + <operation name="start" displayName="Start" description="Start the destination."/> + + <operation name="stop" displayName="Stop" description="Stop the destination."/> +'> + +<!ENTITY deploymentContentConfigProps ' + <configuration> + <c:group name="deployment" displayName="Deployment Options"> + <c:simple-property name="deployExploded" displayName="Deploy Exploded?" type="boolean" required="true" + default="false"> + <c:description> + Should the archive be deployed in exploded form (i.e. as a directory)? + </c:description> + </c:simple-property> + <c:simple-property name="deployFarmed" type="boolean" required="true" default="false"> + <c:description> + Should the application be deployed as a farmed deployment (i.e. to the farm directory, rather than + the deploy directory)? This option should only be set to Yes if this application server instance is + a node in a cluster, otherwise the application creation will fail. If set to Yes, the Deploy + Exploded property must be set to No, since exploded deployments to farm via the Profile Service are + currently not supported. + </c:description> + </c:simple-property> + </c:group> + </configuration> +'> + +<!ENTITY webApplicationMetrics ' + <metric property="contextRoot" + dataType="trait" displayType="summary" + description="this context root of this WAR (e.g. jmx-console) - used as a unique path prefix for URLs + corresponding to this WAR"/> + + <metric property="virtualHosts" + dataType="trait" displayType="summary" + description="the virtual host(s) to which this WAR is deployed"/> +'> + +<!ENTITY webApplicationContextMetrics ' + <metric property="virtualHost" + dataType="trait" displayType="summary" + description="the virtual host with which this context is associated"/> + + <metric property="responseTime" + dataType="calltime" defaultOn="false" defaultInterval="600000" units="milliseconds" destinationType="URL" + description="the minimum, maximum, and average response times for requests serviced by this webapp"/> + + <metric property="activeSessions" + displayName="Currently Active Sessions" + units="none" description="the number of sessions that are currently active for this WAR" /> + + <metric property="maxActive" displayName="Maximum Active Sessions" + units="none" description="the maximum number of sessions that have been active for this WAR" /> + + <metric property="sessionCounter" displayName="Created Sessions" + units="none" description="the number of sessions created for this WAR" + measurementType="trendsup" /> + + <metric property="expiredSessions" displayName="Expired Sessions" + units="none" description="the number of expired sessions for this WAR" + measurementType="trendsup" /> + + <metric property="rejectedSessions" displayName="Rejected Sessions" + units="none" description="the number of sessions rejected for this WAR" + measurementType="trendsup" /> + + <metric property="sessionAverageAliveTime" displayName="Average Session Alive Time" + units="seconds" description="the average alive time of sessions for this WAR" /> + + <metric property="sessionMaxAliveTime" displayName="Max Session Alive Time" + units="seconds" description="the maximum alive time of sessions for this WAR" /> + + <metric property="Servlet.minimumResponseTime" displayName="Minimum Response Time" + units="milliseconds" + description="the minimum response time for requests serviced by this WAR"/> + + <metric property="Servlet.averageResponseTime" displayName="Average Response Time" + units="milliseconds" + description="the average response time for requests serviced by this WAR"/> + + <metric property="Servlet.maximumResponseTime" displayName="Maximum Response Time" + units="milliseconds" + description="the maximum response time for requests serviced by this WAR"/> + + <metric property="Servlet.totalResponseTime" displayName="Total Response Time" + units="milliseconds" measurementType="trendsup" + description="the total response time for requests serviced by this WAR"/> + + <metric property="Servlet.requestCount" displayName="Number of Requests Serviced" + units="none" description="the number of requests serviced by this WAR" + measurementType="trendsup" displayType="summary"/> + + <metric property="Servlet.errorCount" displayName="Number of Error Responses" + units="none" description="the number of error responses sent by this WAR" + measurementType="trendsup" displayType="summary"/> +'> + +<!ENTITY ejb3StatelessSessionBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB3" readOnly="true"/> + <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb3StatefulSessionBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB3" readOnly="true"/> + <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb3MessageDrivenBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB3" readOnly="true"/> + <c:simple-property name="componentSubtype" default="MessageDriven" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb3CommonMetrics ' + <metric property="name" displayName="EJB Name" dataType="trait" displayType="summary" + description="the name of this EJB"/> +'> + +<!ENTITY ejb3SessionBeanMetrics ' + <metric property="availableCount" + description="The number of pooled instances of this EJB3 Session Bean in the method-ready state"/> + + <metric property="createCount" displayType="summary" measurementType="trendsup" + description="The number of instances of this EJB3 Session Bean that have been created since server start"/> + + <metric property="currentSize" displayName="Current Count" + description="The total number of currently pooled instances of this EJB3 Session Bean"/> + + <metric property="maxSize" + description="The maximum number of instances that are allowed to be pooled"/> + + <metric property="removeCount" displayType="summary" measurementType="trendsup" + description="The number of instances of this EJB3 Session Bean that have been removed since server start"/> + +  + <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" + defaultOn="false" defaultInterval="600000" destinationType="Method Name" + description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> +'> + +<!ENTITY ejb3StatefulSessionBeanMetrics ' + <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> +'> + +<!ENTITY ejb3MessageDrivenBeanMetrics ' + <metric property="minPoolSize" measurementType="dynamic" displayType="detail" displayName="Minimum Pool Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="maxPoolSize" measurementType="dynamic" displayType="detail" displayName="Maximum Pool Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + + <metric property="maxMessages" measurementType="dynamic" displayType="detail" displayName="Maximum number of Messages" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> +'> + +<!ENTITY ejb2PoolMetrics ' + <metric property="CurrentPoolSize" displayName="Current Pool Size" displayType="summary" measurementType="dynamic" + description="The number of beans in the pool."/> + + <metric property="MaxPoolSize" displayName="Max Pool Size" displayType="summary" measurementType="dynamic" + description="The maximum pool size."/> +'> + +<!ENTITY ejb2CreateRemoveMetrics ' + <metric property="CreateCount" displayName="Create Count" displayType="summary" measurementType="trendsup" + description="The number of instances of this EJB2 Session Bean that have been created. since server start."/> + + <metric property="RemoveCount" displayName="Remove Count" displayType="summary" measurementType="trendsup" + description="The number of instances of this EJB2 Session Bean that have been removed since server start."/> +'> + +<!ENTITY ejb2SessionBeanMetrics ' +  + <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" + defaultOn="false" defaultInterval="600000" destinationType="Method Name" + description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> +'> + +<!ENTITY ejbInvocationStatsOperation ' + <operation name="viewInvocationStats" displayName="View Method Statistics" description="Display detailed method invocation statistics."> + <results> + <c:list-property name="methods"> + <c:map-property name="method"> + <c:simple-property name="methodName" displayName="Method Name" /> + <c:simple-property name="count" displayName="Count" description="The number of times this method has been called."/> + <c:simple-property name="totalTime" displayName="Total Time" description="The total time spent executing this method."/> + <c:simple-property name="minTime" displayName="Min Invocation Time" description="The fastest execution of this method."/> + <c:simple-property name="maxTime" displayName="Max Invocation Time" description="The slowest execution of this method."/> + </c:map-property> + </c:list-property> + </results> + </operation> +'> + +<!ENTITY ejb2StatelessSessionBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB" readOnly="true"/> + <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb2StatelessSessionBeanMetrics ' +  +'> + +<!ENTITY ejb2StatefulSessionBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB" readOnly="true"/> + <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb2StatefulSessionBeanMetrics ' + <metric displayName="Passive Beans" + description="The count of beans in the passivated state" + property="PassivatedCount" + displayType="summary"/> +'> + +<!ENTITY ejb2MessageDrivenBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB" readOnly="true"/> + <c:simple-property name="componentSubtype" default="MDB" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb2MessageDrivenBeanMetrics ' + <metric property="MessageCount" displayName="Message Count" + description="The number of messages sent/received" + displayType="summary" + measurementType="trendsup" /> +'> + +<!ENTITY ejb2EntityBeanDefinition ' + <plugin-configuration> + <c:simple-property name="componentType" default="EJB" readOnly="true"/> + <c:simple-property name="componentSubtype" default="Entity" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </plugin-configuration> +'> + +<!ENTITY ejb2EntityBeanMetrics ' + <metric property="CacheSize" + displayName="Cache Size" + displayType="summary" + defaultOn="true"/> +'> + +<!ENTITY subscriptionsResultProperty ' + <c:list-property name="result"> + <c:map-property name="subscription"> + <c:simple-property name="id" summary="true" + description="the unique ID of the subscription"/> + <c:simple-property name="clientID" + description="the subscriber-specified client ID"/> + <c:simple-property name="name" + description="the topic name"/> + <c:simple-property name="selector" required="false" + description="the selector, if the subscriber specified one"/> + <c:simple-property name="durable" type="boolean" summary="true" + description="is the subscription durable?"/> + <c:simple-property name="maxSize" type="integer"/> + <c:simple-property name="messageCount" type="integer" summary="true" + description="the number of messages the subscription has received"/> + </c:map-property> + </c:list-property> +'> + +]> + + + + + +<plugin name="JBossAS5" displayName="JBoss Application Server 5.x" package="org.rhq.plugins.jbossas5" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + description="Supports management and monitoring of JBoss AS from version EAP 5" + xmlns="urn:xmlns:rhq-plugin" + xmlns:c="urn:xmlns:rhq-configuration"> + + <depends plugin="JMX" useClasses="true"/> + + <server name="JBossAS Server" + classLoader="instance" + class="ApplicationServerComponent" + discovery="ApplicationServerDiscoveryComponent" + description="JBoss Application Server (AS) or Enterprise Application Platform (EAP) 5.x"> + + <subcategories> + <subcategory name="Resources" + description="Different types of Resources"> + <subcategory name="Datasources" + description="Different types of Datasources"/> + <subcategory name="Connection Factories" + description="Different types of Connection Factories"/> + <subcategory name="JMS Destinations" + description="Different types of JMS Destinations"/> + </subcategory> + <subcategory name="Applications" + description="Different types of Applications (WARs, EARs, etc.)"> + </subcategory> + </subcategories> + + <plugin-configuration> + <c:group name="connectionInfo"> + <c:simple-property name="namingURL" displayName="Naming Provider URL" + description="The JBoss Naming Provider (JNP) URL with which to connect to the JBoss AS or EAP instance (e.g. jnp://127.0.0.1:1099)."/> + <c:simple-property name="principal" required="false" description="The name of the principal (i.e. user) to authenticate."/> + <c:simple-property name="credentials" type="password" required="false" + description="The credentials (i.e. password) that should be used to authenticate the principal."/> + <c:simple-property name="homeDir" displayName="JBoss Home Directory" type="directory" readOnly="true" + description="The absolute path to the directory where JBoss AS or EAP is installed (e.g. /opt/jboss-5.1.0.GA)."/> + <c:simple-property name="serverHomeDir" type="directory" readOnly="true" + description="The path to the configuration directory under which this instance + operates (e.g. /opt/jboss-5.2.0.GA/server/default); if the path is not absolute, + then it will be resolved relative to {homeDir}."/> + <c:simple-property name="serverName" required="false" + description="The name of the server configuration (e.g. minimal, default, or all); + if not specified, it will default to the last path component of {serverHomeDir}." + default="default"/> + </c:group> + <c:group name="control" displayName="Operations"> + <c:simple-property name="scriptPrefix" displayName="Script Prefix" type="string" required="false" + description="A prefix applied to script execution commands. Typically a sudo + for applicable platforms. The prefix is applied verbatim. As such, a + sudo user must be configured appropriately. Ignored if not set."/> + <c:simple-property name="startScript" displayName="Start Script" type="file" required="false" + description="The path to the script used by the 'Start' operation + to start this JBossAS server + (e.g. /opt/jboss-5.2.0.GA/bin/run.sh); if the path is not absolute, + then it will be resolved relative to {jbossHomeDir}; + defaults to 'bin/run.sh' on UNIX or 'bin\run.bat' on Windows."/> + <c:simple-property name="shutdownScript" displayName="Shutdown Script" type="file" required="false" + description="The path to the script used by the Shut Down operation + to shut down this JBossAS server + (e.g. /opt/jboss-5.2.0.GA/bin/shutdown.sh); if the path is not absolute, + then it will be resolved relative to {jbossHomeDir}; + defaults to 'bin/shutdown.sh' on UNIX or 'bin\shutdown.bat' on Windows."/> + <c:simple-property name="shutdownMethod" displayName="Shutdown Method" type="string" required="false" default="JMX" + description="The method used to execute the Shut Down operation; + defaults to 'JMX MBean'."> + <c:property-options> + <c:option value="JMX" name="JMX MBean" default="true"/> + <c:option value="SCRIPT" name="shutdown script"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="bindAddress" displayName="Bind Address" required="false" default="127.0.0.1" + description="The host or IP address that all application server services should listen on + (e.g. 10.11.14.233 or foo.example.com); specify 0.0.0.0 to tell the + application server to bind to all available network interfaces; defaults to + '127.0.0.1'."/> + </c:group> + + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="shutdownMBeanName" displayName="Shutdown MBean Name" + default="jboss.system:type=Server" + description="Name of the MBean to use when shutting down this server through JMX."/> + <c:simple-property name="shutdownMBeanOperation" displayName="Shutdown MBean Operation" default="shutdown" + description="Name of the operation to invoke when shutting down this server through JMX. + Note that only operations with no parameter or with one int parameter are supported. If the + operation requires an int parameter, '0' will be supplied."/> + <c:simple-property name="availabilityCheckPeriod" description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down." + units="seconds" required="false" type="integer"> + <c:constraint> + <c:integer-constraint minimum="60"/> + </c:constraint> + </c:simple-property> + </c:group> + + <c:group name="events"> + <c:list-property name="logEventSources"> + <c:map-property name="logEventSource"> + <c:simple-property name="logFilePath" type="file" summary="true" + description="The absolute path to the source log file."/> + <c:simple-property name="enabled" type="boolean" summary="true" + description="A flag indicating whether of not this log Event source is currently + enabled (i.e. whether the associated log file should be tailed for + new entries)."/> + <c:simple-property name="dateFormat" required="false" + description="The date format to use when parsing the dates in log entries. The + format must be in the syntax defined by the Java SimpleDateFormat + class. If not specified, the three date formats that are predefined + by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/> + <c:simple-property name="includesPattern" required="false" + description="A regular expression against which a log entry's detail is matched + to determine if an Event should be fired for that entry. If not + specified, no filtering of log entries will be done based on their + detail."/> + <c:simple-property name="minimumSeverity" required="false" default="error" + description="The minimum severity of Events that should be collected for this + source. If not specified, there is no minimum severity (i.e. all + events will be collected)."> + <c:property-options> + <c:option name="debug" value="debug"/> + <c:option name="info" value="info"/> + <c:option name="warn" value="warn"/> + <c:option name="error" value="error" default="true"/> + <c:option name="fatal" value="fatal"/> + </c:property-options> + </c:simple-property> + </c:map-property> + </c:list-property> + </c:group> + </plugin-configuration> + + <process-scan name="jbossas" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/> + + <operation name="start" displayName="Start" + description="Start this application server. The script used is specified in the Operations group of connection properties. This operation will fail if the server is already started."> + <results><c:simple-property name="operationResult" description="Outcome of starting the server."/></results> + </operation> + + <operation name="shutdown" displayName="Shut Down" + description="Shut down this application server via script or JMX, depending on the settings in the Operations and Advanced groups of connection properties. This operation will fail if the server is already shut down."> + <results><c:simple-property name="operationResult" description="Outcome of shutting down the server."/></results> + </operation> + + <operation name="restart" displayName="Restart" + description="Shut down (if started) and then start this application server."> + <results><c:simple-property name="operationResult" description="Outcome of restarting the server."/></results> + </operation> + + <metric displayName="Partition Name" property="MCBean|ServerConfig|*|partitionName" + dataType="trait" displayType="summary" + description="the name of the cluster partition this server belongs to"/> + + <metric displayName="Server Name" property="MCBean|ServerConfig|*|serverName" + dataType="trait" displayType="summary" + description="the name of the active profile (i.e. configuration set) this server is using"/> + + <metric displayName="Server Home Dir" property="MCBean|ServerConfig|*|serverHomeDir" + dataType="trait" displayType="summary" + description="the full path of the configuration set directory this server is using (e.g. /opt/jboss-5.1.0.CR1/server/default)"/> + + <metric displayName="Home Dir" property="MCBean|ServerConfig|*|serverHomeDir" + dataType="trait" displayType="summary" + description="the full path of the JBoss AS installation directory this server is using (e.g. /opt/jboss-5.1.0.CR1)"/> + + <metric displayName="Version Name" property="MCBean|MCServer|*|versionName" + dataType="trait" displayType="summary" + description="the code name for the this app server instance's major version (AS 5.0 = Morpheus, AS 5.1 = The Oracle, AS 6.0 = Neo)"/> + + <metric displayName="Build Date" property="MCBean|MCServer|*|buildDate" + dataType="trait" displayType="summary" + description="the date this app server was built"/> + + <metric displayName="Start Date" property="MCBean|MCServer|*|startDate" + dataType="trait" displayType="summary" + description="the date and time this app server instance was started"/> + + <metric displayName="Active Thread Count" property="MCBean|ServerInfo|*|activeThreadCount" + description="The current number of active threads for this app server instance" + defaultInterval="300000" displayType="summary" category="throughput"/> + + <metric displayName="Active Thread Group Count" property="MCBean|ServerInfo|*|activeThreadGroupCount" + description="The current number of active thread groups for this app server instance" + defaultInterval="300000" defaultOn="true" category="throughput"/> + + <metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary" + description="The amount of free memory for the JVM this app server instance is running on" + defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + + <metric displayName="JVM Max Memory" property="MCBean|ServerInfo|*|maxMemory" + description="The amount of max memory for the JVM this app server instance is running on" + defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/> + + <metric displayName="JVM Total Memory" property="MCBean|ServerInfo|*|totalMemory" displayType="summary" + description="The amount of total memory for the JVM this app server instance is running on" + defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/> + + <metric displayName="Total Transactions" property="MCBean|JTA|*|transactionCount" measurementType="trendsup" + defaultInterval="300000" defaultOn="true" category="utilization" + description="Total number of transactions since last restart"/> + + <metric displayName="Transactions Committed" property="MCBean|JTA|*|commitCount" displayType="summary" measurementType="trendsup" + defaultInterval="600000" defaultOn="true" category="utilization" + description="Number of transactions committed since last restart"/> + + <metric displayName="Transactions Rolled Back" property="MCBean|JTA|*|rollbackCount" measurementType="trendsup" + defaultInterval="600000" defaultOn="true" category="utilization" + description="Number of transactions committed since last restart"/> + + <event name="logEntry" description="an entry was appended to a log file"/> + + <content name="library" displayName="JAR Library" category="deployable" + description="Library Jar files deployed in JBoss AS"> + <configuration> + <c:simple-property name="version" readOnly="true" description="The version declared by the JAR's manifest."/> + <c:simple-property name="title" readOnly="true" description="The title declared by the JAR's manifest."/> + <c:simple-property name="url" readOnly="true" description="The url declared by the JAR's manifest."/> + <c:simple-property name="vendor" readOnly="true" description="The vendor declared by the JAR's manifest."/> + <c:simple-property name="classpath" readOnly="true" + description="The classpath declared by the JAR's manifest."/> + <c:simple-property name="sealed" readOnly="true" type="boolean" description="True if the JAR is sealed."/> + </configuration> + </content> + + <content name="cumulativePatch" displayName="Cumulative Patch" category="deployable" + description="Automatically installable application server patches"> + <configuration> + <c:simple-property name="jiraId"/> + <c:simple-property name="distributionStatus"/> + <c:simple-property name="downloadUrl"/> + <c:simple-property name="instructionCompatibilityVersion"/> + </configuration> + </content> + + <server name="JBoss AS JVM" + description="JVM of the JBossAS" + sourcePlugin="JMX" + sourceType="JMX Server" + discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent" + class="org.rhq.plugins.jmx.JMXServerComponent" + singleton="true"/> + + <service name="JBoss Web" + description="JBoss Web Servlet Container" + subCategory="Resources" + discovery="JBossWebDiscoveryComponent" + class="JBossWebComponent" + singleton="true"> + + <service name="Connector" + description="a JBoss Web Connector" + discovery="ConnectorDiscoveryComponent" + class="ConnectorComponent"> + + <plugin-configuration> + <c:simple-property name="protocol" type="string" description="this connector's protocol (e.g. jk, ajp, http)" default="http"/> + <c:simple-property name="address" type="string" description="the IP address this connector listens on" readOnly="true"/> + <c:simple-property name="port" type="integer" description="the port this connector listens on" readOnly="true"/> + <c:group name="advanced"> + <c:simple-property name="componentType" default="MBean" readOnly="true"/> + <c:simple-property name="componentSubtype" default="WebRequestProcessor" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </c:group> + </plugin-configuration> + + <metric property="maxTime" + displayName="Maximum Request Time" + description="the maximum time it took to process a request since the last restart" + units="milliseconds" + defaultOn="true" category="performance"/> + + <metric property="requestCount" + displayName="Request Count" description="the total number of requests processed since the last restart" + defaultOn="false" category="utilization" measurementType="trendsup"/> + + <metric property="errorCount" + displayName="Error Count" description="the number of errors while processing requests since the last restart" + defaultOn="true" category="utilization" measurementType="trendsup"/> + + <metric property="ThreadPool|currentThreadsBusy" + displayName="Current Active Threads" + defaultOn="true" category="utilization" displayType="summary" + description="the number of threads for this connector that are currently active"/> + + <metric property="ThreadPool|currentThreadCount" + displayName="Current Thread Count" + defaultOn="true" category="utilization" displayType="summary" + description="the number of threads for this connector that currently exist"/> + + </service> + + <service name="Virtual Host" + discovery="VirtualHostDiscoveryComponent" + class="VirtualHostComponent" + description="a JBoss Web virtual host"> + + <plugin-configuration> + <c:simple-property name="name" type="string" description="the virtual host's name (e.g. localhost)"/> + <c:group name="advanced"> + <c:simple-property name="componentType" default="MBean" readOnly="true"/> + <c:simple-property name="componentSubtype" default="WebHost" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </c:group> + </plugin-configuration> + + <metric property="aliases" + description="the aliases for this virtual host, if any" + dataType="trait" displayType="summary"/> + </service> + + </service> + + +  + + <service name="No Tx Datasource" + class="ManagedComponentComponent" + discovery="ManagedComponentDiscoveryComponent" + createDeletePolicy="both" + subCategory="Datasources" + description="No Transaction Datasources deployed in the instance of JBoss AS"> + + <plugin-configuration> + <c:simple-property name="componentType" default="DataSource" readOnly="true"/> + <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="NoTxDataSourceTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + </plugin-configuration> + + &datasourceAndConnectionFactoryOperations; + + &managedObjectMetrics; + &datasourceMetrics; + + <resource-configuration> + +  + + <c:group name="connection" displayName="Connection Information"> + &datasourceConnectionResourceConfigProps; + &datasourceAndConnectionFactoryConnectionResourceConfigProps; + &nonXaDatasourceConnectionResourceConfigProps; + </c:group> + + <c:group name="advanced" displayName="Advanced"> + &datasourceAndConnectionFactoryAdvancedResourceConfigProps; + &datasourceAdvancedResourceConfigProps; + </c:group> + + <c:template name="Oracle No TX" description="No Transaction Datasource for Oracle"> + &nonXaDatasourceOracleTemplateProps; + </c:template> + + </resource-configuration> + + </service> + + <service name="Local Tx Datasource" + class="ManagedComponentComponent" + discovery="ManagedComponentDiscoveryComponent" + createDeletePolicy="both" + subCategory="Datasources" + description="Local Transaction Datasources deployed in the instance of JBoss AS"> + + <plugin-configuration> + <c:simple-property name="componentType" default="DataSource" readOnly="true"/> + <c:simple-property name="componentSubtype" default="LocalTx" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="LocalTxDataSourceTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + </plugin-configuration> + + &datasourceAndConnectionFactoryOperations; + + &managedObjectMetrics; + &datasourceMetrics; + + <resource-configuration> + +  + + <c:group name="connection" displayName="Connection Information"> + &datasourceConnectionResourceConfigProps; + &datasourceAndConnectionFactoryConnectionResourceConfigProps; + &nonXaDatasourceConnectionResourceConfigProps; + </c:group> + + <c:group name="advanced" displayName="Advanced"> + &datasourceAndConnectionFactoryAdvancedResourceConfigProps; + &datasourceAdvancedResourceConfigProps; + </c:group> + + <c:template name="Oracle Local TX" description="Local Transaction Datasource for Oracle"> + &nonXaDatasourceOracleTemplateProps; + <c:simple-property name="track-connection-by-tx" default="true"/> + </c:template> + + </resource-configuration> + + </service> + + <service name="XA Datasource" + class="ManagedComponentComponent" + discovery="ManagedComponentDiscoveryComponent" + createDeletePolicy="both" + subCategory="Datasources" + description="XA Datasources deployed in the instance of JBoss AS"> + + <plugin-configuration> + <c:simple-property name="componentType" default="DataSource" readOnly="true"/> + <c:simple-property name="componentSubtype" default="XA" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="XADataSourceTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + </plugin-configuration> + + &datasourceAndConnectionFactoryOperations; + + &managedObjectMetrics; + &datasourceMetrics; + + <resource-configuration> + +  + <c:group name="connection" displayName="Connection Information"> + + &datasourceConnectionResourceConfigProps; + &datasourceAndConnectionFactoryConnectionResourceConfigProps; + + <c:simple-property name="xa-datasource-class" + displayName="XA DataSource Class" + description="The fully qualified name of the javax.sql.XADataSource implementation class." + activationPolicy="immediate"/> + + <c:map-property name="xa-datasource-properties" displayName="XA Datasource Properties" required="true"> + <c:description> + The properties to assign to the XADataSource implementation class. + Each property is mapped + onto the XADataSource implementation by looking for a JavaBeans style + getter method for the property name. If found, the value of the property is + set using the JavaBeans setter with the element text translated to the true + property type using the java.beans.PropertyEditor for the type. + </c:description> + </c:map-property> + + <c:simple-property name="xa-resource-timeout" + displayName="XA Resource Timeout" + required="false" + type="integer" + activationPolicy="immediate"> + <c:description> + XA transaction timeout, in seconds (passed to XAResource.setTransactionTimeout()) - + default is zero which does not invoke the setter. + </c:description> + </c:simple-property> + + <c:simple-property name="url-property" + displayName="URL Property" + required="false" + description="For HA XA datasources, specifies the name of an XADataSource property that contains a list of URLs." + activationPolicy="immediate"/> + </c:group> + + <c:group name="advanced" displayName="Advanced"> + &datasourceAndConnectionFactoryAdvancedResourceConfigProps; + &datasourceAdvancedResourceConfigProps; + + <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false"> + <c:description> + If true, enable transaction interleaving if the DB vendor supports it (most do not). + This property supersedes the "track-connection-by-tx" property from earlier versions of + JBoss AS. The default is false. + </c:description> + </c:simple-property> + </c:group> + + <c:template name="Oracle XA" description="XA Transaction Datasource for Oracle"> + <c:simple-property name="track-connection-by-tx" default="true"/> + <c:simple-property name="isSameRM-override-value" default="false"/> + <c:simple-property name="xa-datasource-class" default="oracle.jdbc.xa.client.OracleXADataSource"/> + <c:simple-property name="exception-sorter-class-name" + default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/> +  + <c:simple-property name="no-tx-separate-pools" default="true"/> + <c:simple-property name="use-try-lock" default="60000"/> + <c:map-property name="metadata"> + <c:simple-property name="typeMapping" default="Oracle9i"/> + </c:map-property> + <c:simple-property name="type-mapping" default="Oracle9i"/> + </c:template> + + </resource-configuration> + + </service> + + <service name="No Tx ConnectionFactory" + description="A ConnectionFactory that does not take part in JTA transactions." + class="ManagedComponentComponent" + createDeletePolicy="both" + subCategory="Connection Factories" + discovery="ManagedComponentDiscoveryComponent"> + + <plugin-configuration> + <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/> + <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="NoTxConnectionFactoryTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + <c:group name="managedPropertyGroup" + displayName="managedPropertyGroup" + hiddenByDefault="true"> + <c:map-property name="customProperties" + description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> + <c:simple-property name="config-property" + default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" /> + </c:map-property> + </c:group> + </plugin-configuration> + + &datasourceAndConnectionFactoryOperations; + + &managedObjectMetrics; + &connectionFactoryMetrics; + + <resource-configuration> + + <c:group name="connection" displayName="Connection Information"> + &connectionFactoryConnectionResourceConfigProps; + &datasourceAndConnectionFactoryConnectionResourceConfigProps; + </c:group> + + <c:group name="advanced" displayName="Advanced"> + &datasourceAndConnectionFactoryAdvancedResourceConfigProps; + &connectionFactoryAdvancedResourceConfigProps; + </c:group> + </resource-configuration> + + </service> + + <service name="Tx ConnectionFactory" + description="A ConnectionFactory that takes part in JTA transactions." + class="TxConnectionFactoryComponent" + createDeletePolicy="both" + subCategory="Connection Factories" + discovery="ManagedComponentDiscoveryComponent"> + + <plugin-configuration> + <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/> + <c:simple-property name="componentSubtype" default="Tx" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="TxConnectionFactoryTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + <c:group name="managedPropertyGroup" + displayName="managedPropertyGroup" + hiddenByDefault="true"> + <c:map-property name="customProperties" + description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> + <c:simple-property name="config-property" + default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" /> + </c:map-property> + </c:group> + </plugin-configuration> + + &datasourceAndConnectionFactoryOperations; + + <metric property="custom.transactionType" displayName="Transaction Type" displayType="summary" + description="The type of transactions used by this connection factory - Local or XA" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + + &managedObjectMetrics; + &connectionFactoryMetrics; + + <resource-configuration> + + <c:group name="connection" displayName="Connection Information"> + + &connectionFactoryConnectionResourceConfigProps; + &datasourceAndConnectionFactoryConnectionResourceConfigProps; + + <c:simple-property name="xa-transaction" + type="boolean" + displayName="XA Transaction" + required="false" readOnly="true"> + <c:description> + Whether on not to use XA transactions. The default is No. + </c:description> + </c:simple-property> + + </c:group> + + <c:group name="advanced" displayName="Advanced"> + + &datasourceAndConnectionFactoryAdvancedResourceConfigProps; + &connectionFactoryAdvancedResourceConfigProps; + + <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false"> + <c:description> + If true, enable transaction interleaving if the DB vendor supports it (most do not). + Can only be set to true if XA transactions are enabled. + This property supersedes the "track-connection-by-tx" property from earlier versions of + JBoss AS. The default is false. + </c:description> + </c:simple-property> + + <c:simple-property name="xa-resource-timeout" + type="integer" + displayName="XA Resource Timeout" + units="minutes" + defaultValue="0" + required="false"> + <c:description> + The maximum time, in minutes, an XA Resource can be idle before it is removed. 0 means no + timeout. The default is 0. + </c:description> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + + </c:group> + + <c:template name="Local Transaction" description="a connection factory that uses local transactions"> + <c:simple-property name="xa-transaction" default="false"/> + </c:template> + + <c:template name="XA Transaction" description="a connection factory that uses XA transactions"> + <c:simple-property name="xa-transaction" default="true"/> + </c:template> + </resource-configuration> + + </service> + + <service name="Queue" + class="JmsDestinationComponent" + createDeletePolicy="both" + subCategory="JMS Destinations" + discovery="JmsDestinationDiscoveryComponent"> + + <plugin-configuration> + <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/> + <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true"> + <c:simple-property name="jms-type" default="queue"/> + <c:map-property name="customProperties" + description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> + <c:simple-property name="securityConfig" + default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/> + </c:map-property> + </c:group> + </plugin-configuration> + + &destinationOperations; + + <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="selector"/> + </parameters> + <results> + <c:notes>List all messages with selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="selector"/> + </parameters> + <results> + <c:notes>List all durable messages using a selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="selector"/> + </parameters> + <results> + <c:notes>List all non durable messages using a selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML"> + <results> + <c:notes>Get the message counter as HTML</c:notes> + <c:simple-property name="result" type="longString"/> + </results> + </operation> + + <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML"> + <results> + <c:notes>Get the message counter history as HTML</c:notes> + <c:simple-property name="result" type="longString"/> + </results> + </operation> + + <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/> + + <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/> + + &managedObjectMetrics; + +  + + <metric property="createdProgrammatically" displayType="summary" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/> + +  + <metric property="messageCounterHistoryDayLimit" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/> + +  + + <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The number of consumers on the queue"/> + + <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The number of messages currently being delivered"/> + + <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The number of messages in the queue"/> + + <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The number of scheduled messages in the queue"/> + + <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" + description="The total message count since startup or last counter reset"/> + + <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" + description="The message count delta since last method call"/> + + <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" + description="The current message count of pending messages within the queue waiting for dispatch"/> + + <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" + description="The message count delta of pending messages since last method call"/> + + <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization" + description="The timestamp of the last message add"/> + + <resource-configuration> + +  + + <c:simple-property required="true" name="name" readOnly="true" + description="The name of this queue (e.g. 'MyQueue')."/> + + <c:simple-property required="true" name="JNDIName" readOnly="true" + description="This queue's JNDI name (e.g. '/queue/MyQueue')."/> + + <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false"> + <c:description> + Is this queue clustered? For an existing queue, this property is read-only. If not specified + when creating a new queue, the default value is false. + </c:description> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000"> + <c:description> + When paging messages to storage from a subscription, they first go into a "Down Cache" before + being written to storage. This enables the write to occur as a single operation, thus aiding + performance. This setting determines the maximum number of messages that the Down Cache will hold + before they are flushed to storage. + Updates to this property will not go into effect until the queue has been restarted. + The default value is 2000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000"> + <c:description> + The maximum number of messages for the queue held in memory at any one time. + The actual queue can hold many more messages than this, but these are paged to and from + storage as necessary, as messages are added or consumed. + Updates to this property will not go into effect until the queue has been restarted. + The default value is 200000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1"> + <c:description> + The number of delivery attempts before a message to a subscriber of this queue is moved to the + DLQ. The default value is 10. A value of -1 indicates the default value should be used. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1"> + <c:description> + The maximum number of messages this queue can hold before they are dropped. + A value of -1 means there is no maximum. The default value is -1. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000"> + <c:description> + When loading messages from a subscription, this is the maximum number of messages to + pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size. + Updates to this property will not go into effect until the queue has been restarted. + The default value is 2000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1"> + <c:description> + The delay in milliseconds before a rolled back or recovered message is redelivered. + Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="DLQ"> + <c:description> + The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g. + "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the + server peer. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="expiryQueue"> + <c:description> + The JMX ObjectName of the expiry queue for this queue (e.g. + "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default + expiry queue on the server peer. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="serverPeer"> + <c:description> + The JMX ObjectName of the server peer this queue was deployed on (e.g. + "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until + the queue has been restarted. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:list-property name="securityConfig" max="4" min="2" + displayName="Security Configurations" + description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute."> + <c:map-property name="role" + displayName="Security Configuration Attributes" + description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue"> + <c:simple-property name="name" + displayName="Name" + description="Name of the Security Role. e.g. Guest" + summary="true" + required="true"/> + <c:simple-property name="read" + displayName="Read" + description="Is this role allowed to read messages?" + summary="true" + required="false" + type="boolean"/> + <c:simple-property name="write" + displayName="Write" + description="Is this role allowed to write messages?" + summary="true" + required="false" + type="boolean"/> + <c:simple-property name="create" + displayName="Create" + description="Is this role allowed to create messages?" + summary="true" + required="false" + type="boolean"/> + </c:map-property> + + </c:list-property> + + </resource-configuration> + + <help> + <![CDATA[ + <p>The message counter metrics will not be collected by default. In order + for these metrics to be collected for all Topics and Queues for a given application server instance, + go to the instance's JMX Console, and invoke the + <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean. + To ensure the message counters are still enabled when the application server is restarted, + edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the + <tt>EnableMessageCounters</tt> attribute to "true".</p> + ]]> + </help> + + </service> + + <service name="Topic" + class="JmsDestinationComponent" + createDeletePolicy="both" + subCategory="JMS Destinations" + discovery="JmsDestinationDiscoveryComponent"> + + <plugin-configuration> + <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/> + <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/> + <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true"> + <c:description> + The name of the Resource configuration property whose value should be used as the + underlying ManagedComponent name when creating a new Resource of this type. + </c:description> + </c:simple-property> + <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true"> + <c:simple-property name="jms-type" default="topic"/> + <c:map-property name="customProperties" + description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties."> + <c:simple-property name="securityConfig" + default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/> + </c:map-property> + </c:group> + </plugin-configuration> + + &destinationOperations; + + <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> + <c:simple-property required="false" name="arg#1" displayName="selector"/> + </parameters> + <results> + <c:notes>List all messages for the specified subscription with the specified selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> + <c:simple-property required="false" name="arg#1" displayName="selector"/> + </parameters> + <results> + <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector"> + <parameters> + <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/> + <c:simple-property required="false" name="arg#1" displayName="selector"/> + </parameters> + <results> + <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes> + <c:list-property name="result"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="listAllSubscriptions" displayName="List All Subscriptions" + description="Return all subscriptions for the topic"> + <results> + <c:notes>Return all subscriptions for the topic</c:notes> + &subscriptionsResultProperty; + </results> + </operation> + + <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML" + description="Return all subscriptions for the topic as HTML"> + <results> + <c:notes>Return all subscriptions for the topic as HTML</c:notes> + <c:simple-property name="result" type="longString"/> + </results> + </operation> + + <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions" + description="Return all durable subscriptions for the topic"> + <results> + <c:notes>Return all durable subscriptions for the topic</c:notes> + &subscriptionsResultProperty; + </results> + </operation> + + <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML" + description="Return all durable subscriptions for the topic as HTML"> + <results> + <c:notes>Return all durable subscriptions for the topic as HTML</c:notes> + <c:simple-property name="result" type="longString"/> + </results> + </operation> + + <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions" + description="Return all non-durable subscriptions for the topic"> + <results> + <c:notes>Return all non-durable subscriptions for the topic</c:notes> + &subscriptionsResultProperty; + </results> + </operation> + + <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML" + description="Return all non-durable subscriptions for the topic as HTML"> + <results> + <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes> + <c:simple-property name="result" type="longString"/> + </results> + </operation> + + &managedObjectMetrics; + +  + + <metric property="createdProgrammatically" displayType="summary" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/> + +  + <metric property="messageCounterHistoryDayLimit" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance" + description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/> + +  + + <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all messages in all subscriptions to this topic"/> + + <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all subscriptions to this topic"/> + + <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all messages for all durable subscriptions to this topic"/> + + <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all durable subscriptions to this topic"/> + + <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all messages in all non durable subscriptions to this topic"/> + + <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput" + description="The count of all non durable subscriptions to this topic"/> + + <resource-configuration> + +  + + <c:simple-property required="true" name="name" readOnly="true" + description="The name of this topic (e.g. 'MyTopic')."/> + + <c:simple-property required="true" name="JNDIName" readOnly="true" + description="This topic's JNDI name (e.g. '/topic/MyTopic')"/> + + <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false"> + <c:description> + Is this topic clustered? For an existing topic, this property is read-only. If not specified + when creating a new topic, the default value is false. + </c:description> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000"> + <c:description> + When paging messages to storage from a subscription, they first go into a "Down Cache" before + being written to storage. This enables the write to occur as a single operation, thus aiding + performance. This setting determines the maximum number of messages that the Down Cache will hold + before they are flushed to storage. + Updates to this property will not go into effect until the topic has been restarted. + The default value is 2000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000"> + <c:description> + The maximum number of messages held by the topic subscriptions in memory at any one time. + The actual subscription can hold many more messages than this, but these are paged to and from + storage as necessary, as messages are added or consumed. + Updates to this property will not go into effect until the topic has been restarted. + The default value is 200000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1"> + <c:description> + The number of delivery attempts before a message to a subscriber of this topic is moved to the + DLQ. The default value is 10. A value of -1 indicates the default value should be used. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1"> + <c:description> + The maximum number of messages this topic can hold before they are dropped. + A value of -1 means there is no maximum. The default value is -1. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000"> + <c:description> + When loading messages from a subscription, this is the maximum number of messages to + pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size. + Updates to this property will not go into effect until the topic has been restarted. + The default value is 2000. + </c:description> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1"> + <c:description> + The delay in milliseconds before a rolled back or recovered message is redelivered. + Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used. + </c:description> + <c:constraint> + <c:integer-constraint minimum="-1"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="DLQ"> + <c:description> + The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g. + "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the + server peer. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="expiryQueue"> + <c:description> + The JMX ObjectName of the expiry queue for this topic (e.g. + "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default + expiry queue on the server peer. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:simple-property required="false" name="serverPeer"> + <c:description> + The JMX ObjectName of the server peer this topic was deployed on (e.g. + "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until + the topic has been restarted. + </c:description> + <c:constraint> + <c:regex-constraint expression="[^:]+:.+"/> + </c:constraint> + </c:simple-property> + + <c:list-property name="securityConfig" max="4" min="2" + displayName="Security Configurations" + description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute."> + <c:map-property name="role" + displayName="Security Configuration Attributes" + description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue"> + <c:simple-property name="name" + displayName="Name" + description="Name of the Security Role. e.g. Guest" + summary="true" + required="true"/> + <c:simple-property name="read" + displayName="Read" + description="Is this role allowed to read messages?" + summary="true" + required="false" + type="boolean"/> + <c:simple-property name="write" + displayName="Write" + description="Is this role allowed to write messages?" + summary="true" + required="false" + type="boolean"/> + <c:simple-property name="create" + displayName="Create" + description="Is this role allowed to create messages?" + summary="true" + required="false" + type="boolean"/> + </c:map-property> + </c:list-property> + + </resource-configuration> + + <help> + <![CDATA[ + <p>The message counter metrics will not be collected by default. In order + for these metrics to be collected for all Topics and Queues for a given application server instance, + go to the instance's JMX Console, and invoke the + <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean. + To ensure the message counters are still enabled when the application server is restarted, + edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the + <tt>EnableMessageCounters</tt> attribute to "true".</p> + ]]> + </help> + + </service> + + +  + + <service name="Enterprise Application (EAR)" + subCategory="Applications" + class="StandaloneManagedDeploymentComponent" + discovery="StandaloneManagedDeploymentDiscoveryComponent" + description="JEE enterprise application (EAR)" + createDeletePolicy="both" + creationDataType="content"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="ear" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="Enterprise Application" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEApplication" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <operation name="start" + description="starts this EAR"/> + + <operation name="stop" + description="stops this EAR"/> + + <operation name="restart" + description="stops and then restarts this EAR"/> + + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this EAR file or directory"/> + + <metric property="custom.exploded" displayName="Exploded?" + dataType="trait" displayType="summary" + description="whether this EAR is deployed exploded (i.e. as a directory)"/> + + <content name="file" displayName="EAR File" category="deployable" isCreationType="true"> + &deploymentContentConfigProps; + </content> + + </service> + + <service name="Web Application (WAR)" + subCategory="Applications" + class="StandaloneManagedDeploymentComponent" + discovery="StandaloneManagedDeploymentDiscoveryComponent" + description="a standalone web application (WAR)" + createDeletePolicy="both" + creationDataType="content"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="war" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="a standalone web application (WAR)" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <operation name="start" + description="starts this WAR"/> + + <operation name="stop" + description="stops this WAR"/> + + <operation name="restart" + description="stops and then restarts this WAR"/> + + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this WAR file or directory"/> + + <metric property="custom.exploded" displayName="Exploded?" + dataType="trait" displayType="summary" + description="whether this WAR is deployed exploded (i.e. as a directory)"/> + + &webApplicationMetrics; + + <content name="file" displayName="WAR File" category="deployable" isCreationType="true"> + &deploymentContentConfigProps; + </content> + + <service name="Web Application Context" + class="WebApplicationContextComponent" + discovery="WebApplicationContextDiscoveryComponent" + description="a web application context"> + + <plugin-configuration> + <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/> + <c:group name="advanced"> + <c:simple-property name="componentType" default="MBean" readOnly="true"/> + <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </c:group> + <c:group name="ResponseTime"> + <c:simple-property name="responseTimeLogFile" required="false" + description="the full path to the log file containing response-time stats for this webapp"/> + <c:simple-property name="responseTimeUrlExcludes" required="false" + description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> + <c:simple-property name="responseTimeUrlTransforms" required="false" + description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> + </c:group> + </plugin-configuration> + + &webApplicationContextMetrics; + </service> + + </service> + + <service name="Embedded Web Application (WAR)" + subCategory="Applications" + class="EmbeddedManagedDeploymentComponent" + discovery="EmbeddedManagedDeploymentDiscoveryComponent" + description="an embedded web application (WAR)"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/> + <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/> + </c:group> + <c:group name="ResponseTime"> + <c:simple-property name="responseTimeLogFile" required="false" + description="the full path to the log file containing response-time stats for this webapp"/> + <c:simple-property name="responseTimeUrlExcludes" required="false" + description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> + <c:simple-property name="responseTimeUrlTransforms" required="false" + description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="war" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="an embedded web application (WAR)" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + <c:simple-property name="embedded" default="JavaEEWebApplication" readOnly="true"/> + </c:group> + </plugin-configuration> + + <metric property="custom.parent" displayName="Parent" + dataType="trait" displayType="summary" + description="the name of this WAR's parent deployment"/> + + &webApplicationMetrics; + + <service name="Embedded Web Application Context" + class="WebApplicationContextComponent" + discovery="WebApplicationContextDiscoveryComponent" + description="a web application context"> + + <plugin-configuration> + <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/> + <c:group name="advanced"> + <c:simple-property name="componentType" default="MBean" readOnly="true"/> + <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </c:group> + <c:group name="ResponseTime"> + <c:simple-property name="responseTimeLogFile" required="false" + description="the full path to the log file containing response-time stats for this webapp"/> + <c:simple-property name="responseTimeUrlExcludes" required="false" + description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> + <c:simple-property name="responseTimeUrlTransforms" required="false" + description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> + </c:group> + </plugin-configuration> + + &webApplicationContextMetrics; + </service> + + </service> + + <service name="EJB2 JAR" + subCategory="Applications" + class="StandaloneManagedDeploymentComponent" + discovery="StandaloneManagedDeploymentDiscoveryComponent" + description="a standalone EJB 2.x application" + createDeletePolicy="both" + creationDataType="content"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="jar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="a standalone EJB 2.x application" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <operation name="start" + description="starts this EJB JAR"/> + + <operation name="stop" + description="stops this EJB JAR"/> + + <operation name="restart" + description="stops and then restarts this EJB JAR"/> + + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this EJB JAR file or directory"/> + + <metric property="custom.exploded" displayName="Exploded?" + dataType="trait" displayType="summary" + description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/> + + <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true"> + &deploymentContentConfigProps; + </content> + + <service name="EJB2 Stateless Session Bean" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Stateless Session Bean"> + &ejb2StatelessSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2SessionBeanMetrics; + &ejb2StatelessSessionBeanMetrics; + + <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" + defaultOn="false" defaultInterval="600000" destinationType="Method Name" + description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> + </service> + + <service name="EJB2 Stateful Session Bean" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Stateful Session Bean"> + &ejb2StatefulSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2SessionBeanMetrics; + &ejb2StatefulSessionBeanMetrics; + + <metric property="methodInvocationTime" dataType="calltime" units="milliseconds" + defaultOn="false" defaultInterval="600000" destinationType="Method Name" + description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/> + </service> + + <service name="EJB2 Message-Driven Bean" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Message Driven Bean"> + &ejb2MessageDrivenBeanDefinition; + &ejb2PoolMetrics; + &ejb2MessageDrivenBeanMetrics; + </service> + + <service name="EJB2 Entity Bean" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Entity Bean"> + &ejb2EntityBeanDefinition; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2EntityBeanMetrics; + </service> + </service> + + <service name="Embedded EJB2 JAR" + subCategory="Applications" + class="EmbeddedManagedDeploymentComponent" + discovery="EmbeddedManagedDeploymentDiscoveryComponent" + description="an embedded EJB 2.x application"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="jar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="an embedded EJB 2.x application" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <metric property="custom.parent" displayName="Parent" + dataType="trait" displayType="summary" + description="the name of this EJB JAR's parent deployment"/> + + <service name="EJB2 Stateless Session Bean (Embedded)" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Stateless Session Bean"> + &ejb2StatelessSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2SessionBeanMetrics; + &ejb2StatelessSessionBeanMetrics; + </service> + + <service name="EJB2 Stateful Session Bean (Embedded)" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Stateful Session Bean"> + &ejb2StatefulSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2SessionBeanMetrics; + &ejb2StatefulSessionBeanMetrics; + </service> + + <service name="EJB2 Message-Driven Bean (Embedded)" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Message Driven Bean"> + &ejb2MessageDrivenBeanDefinition; + &ejb2PoolMetrics; + &ejb2MessageDrivenBeanMetrics; + </service> + + <service name="EJB2 Entity Bean (Embedded)" + class="Ejb2BeanComponent" + discovery="Ejb2BeanDiscoveryComponent" + description="An EJB2 Entity Bean"> + &ejb2EntityBeanDefinition; + &ejb2CreateRemoveMetrics; + &ejb2PoolMetrics; + &ejb2EntityBeanMetrics; + </service> + </service> + + <service name="EJB3 JAR" + subCategory="Applications" + class="StandaloneManagedDeploymentComponent" + discovery="StandaloneManagedDeploymentDiscoveryComponent" + description="a standalone EJB 3.x application" + createDeletePolicy="both" + creationDataType="content"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="jar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="a standalone EJB 3.x application" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <operation name="start" + description="starts this EJB JAR"/> + + <operation name="stop" + description="stops this EJB JAR"/> + + <operation name="restart" + description="stops and then restarts this EJB JAR"/> + + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this EJB JAR file or directory"/> + + <metric property="custom.exploded" displayName="Exploded?" + dataType="trait" displayType="summary" + description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/> + + <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true"> + &deploymentContentConfigProps; + </content> + + <service name="EJB3 Stateless Session Bean" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Stateless Session Bean (SLSB)"> + &ejb3StatelessSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3SessionBeanMetrics; + </service> + + <service name="EJB3 Stateful Session Bean" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Stateful Session Bean (SFSB)"> + &ejb3StatefulSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3SessionBeanMetrics; + &ejb3StatefulSessionBeanMetrics; + </service> + + <service name="EJB3 Message-Driven Bean" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Message-Driven Bean (MDB)"> + &ejb3MessageDrivenBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3MessageDrivenBeanMetrics; + </service> + + </service> + + <service name="Embedded EJB3 JAR" + subCategory="Applications" + class="EmbeddedManagedDeploymentComponent" + discovery="EmbeddedManagedDeploymentDiscoveryComponent" + description="an embedded EJB 3.x application"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="jar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="an embedded EJB 3.x application" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <metric property="custom.parent" displayName="Parent" + dataType="trait" displayType="summary" + description="the name of this EJB JAR's parent deployment"/> + + <service name="EJB3 Stateless Session Bean (Embedded)" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Stateless Session Bean (SLSB)"> + &ejb3StatelessSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3SessionBeanMetrics; + </service> + + <service name="EJB3 Stateful Session Bean (Embedded)" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Stateful Session Bean (SFSB)"> + &ejb3StatefulSessionBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3SessionBeanMetrics; + &ejb3StatefulSessionBeanMetrics; + </service> + + <service name="EJB3 Message-Driven Bean (Embedded)" + class="Ejb3BeanComponent" + discovery="Ejb3BeanDiscoveryComponent" + description="An EJB3 Message-Driven Bean (MDB)"> + &ejb3MessageDrivenBeanDefinition; + &ejbInvocationStatsOperation; + &ejb3CommonMetrics; + &ejb3MessageDrivenBeanMetrics; + </service> + + </service> + + <service name="Resource Adapter Archive (RAR)" + subCategory="Applications" + class="StandaloneManagedDeploymentComponent" + discovery="StandaloneManagedDeploymentDiscoveryComponent" + description="a standalone JCA resource adapter archive (RAR)" + createDeletePolicy="both" + creationDataType="content"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="rar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="a standalone resource adapter" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <operation name="start" + description="starts this RAR"/> + + <operation name="stop" + description="stops this RAR"/> + + <operation name="restart" + description="stops and then restarts this RAR"/> + + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this RAR file or directory"/> + + <metric property="custom.exploded" displayName="Exploded?" + dataType="trait" displayType="summary" + description="whether this RAR is deployed exploded (i.e. as a directory)"/> + + <content name="file" displayName="RAR File" category="deployable" isCreationType="true"> + &deploymentContentConfigProps; + </content> + + </service> + + <service name="Embedded Resource Adapter Archive (RAR)" + subCategory="Applications" + class="EmbeddedManagedDeploymentComponent" + discovery="EmbeddedManagedDeploymentDiscoveryComponent" + description="an embedded JCA resource adapter archive (RAR)"> + + <plugin-configuration> + <c:group name="general" displayName="General"> + <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/> + <c:simple-property name="filename" readOnly="true"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="extension" default="rar" readOnly="true"/> + <c:simple-property name="descriptionTemplate" default="an embedded resource adapter" readOnly="true"/> + <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true"> + <c:description> + The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum + corresponding to this deployment's type. + </c:description> + </c:simple-property> + </c:group> + </plugin-configuration> + + <metric property="custom.parent" displayName="Parent" + dataType="trait" displayType="summary" + description="the name of this RAR's parent deployment"/> + + </service> + + <service name="Script" + discovery="org.rhq.plugins.jbossas5.script.ScriptDiscoveryComponent" + class="org.rhq.plugins.jbossas5.script.ScriptComponent" + supportsManualAdd="true" + subCategory="Resources" + description="provides the ability to execute a script that performs some task related to its parent JBossAS server"> + + <plugin-configuration> + <c:simple-property name="path" description="the absolute path to the script file"/> + <c:simple-property name="environmentVariables" type="longString" required="false" + description="the environment variables that will be passed to the script; each variable must + be on a new line and have the syntax name=value; the variable's value can contain properties + with the syntax %propertyName%; the script plugin will interpolate these with + the current values of the corresponding properties from the + script's parent JBossAS server's connection properties"/> + </plugin-configuration> + + <operation name="execute" displayName="Execute Script" + description="execute the script; NOTE: environment variables to be + passed to the script can be configured via this Script + service's connection properties (under its Inventory tab)"> + <parameters> + <c:simple-property name="commandLineArguments" type="longString" required="false" + description="the command-line arguments (if any) to pass to the script; each + command-line argument must be on a new line; + the arguments can contain properties + with the syntax %propertyName%; the script plugin will interpolate these with + the current values of the corresponding properties from the + script's parent JBossAS server's connection properties"/> + </parameters> + <results> + <c:simple-property name="exitCode" type="integer" description="the script's exit code (0 indicates success, any other value indicates failure)"/> + <c:simple-property name="output" type="longString" description="the script's output (stdout and stderr interleaved)"/> + </results> + </operation> + + </service> + + <service name="Service Binding Manager" + class="org.rhq.plugins.jbossas5.serviceBinding.ManagerComponent" + discovery="org.rhq.plugins.jbossas5.serviceBinding.ManagerDiscoveryComponent" + description="The Service Binding Manager manages the ports of the deployed services" + singleton="true"> + + <plugin-configuration> + <c:simple-property name="componentType" default="MCBean" readOnly="true"/> + <c:simple-property name="componentSubtype" default="ServiceBindingManager" readOnly="true"/> + <c:simple-property name="componentName" readOnly="true"/> + </plugin-configuration> + + <metric property="activeBindingSetName" dataType="trait" displayName="Active Binding Set" + displayType="summary" description="The active binding set used to obtain port bindings from." /> + + <resource-configuration> + <c:simple-property name="activeBindingSetName" + activationPolicy="restart"> + <c:description><![CDATA[ +The name of the binding set the Service Binding Manager should use when resolving bindings. +Note to JBoss ON or Jopr users (does not apply to JBoss AS admin console): +CHANGING THIS PROPERTY IS POTENTIALLY DANGEROUS because if there are any port conflicts +on the machine the Application Server is running on, the server will not start up again and +it will not be possible to monitor it. +To be able to monitor the server again after the restart you have to update the "Naming Provider Url" +in the "Connection" subtab in the "Inventory" of the Application Server to the value +of "jboss:service=Naming:Port" binding of the active binding set. +I.e. if the "jboss:service=Naming:Port" binding of the active binding set has the port set to 4099 and hostname to 127.0.0.1, +you have to set the "Naming Provider Url" to jnp://127.0.0.1:4099. + ]]></c:description> + </c:simple-property> + <c:list-property name="standardBindings" description="The standard port bindings inherited by the binding sets."> + <c:map-property name="binding"> + <c:simple-property name="serviceName" description="The name of the service to which this binding applies."/> + <c:simple-property name="bindingName" required="false" description="A qualifier identifying which particular binding within the service this is."/> + <c:simple-property name="port" type="integer" description="The port to use for the binding."> + <c:constraint> + <c:integer-constraint minimum="0"/> + <c:integer-constraint maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="hostname" required="false" description="The host name or string notation IP address to use for the binding."/> + <c:simple-property name="description" required="false" description="Description of the binding."/> + <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> + <c:simple-property name="fixedHostName" type="boolean" description="Whether the host name should remain fixed in all binding sets."/> + <c:simple-property name="fixedPort" type="boolean" description="Whether the port should remain fixed in all binding sets."/> + </c:map-property> + </c:list-property> + </resource-configuration> + + <service name="Service Binding Set" + class="org.rhq.plugins.jbossas5.serviceBinding.SetComponent" + discovery="org.rhq.plugins.jbossas5.serviceBinding.SetDiscoveryComponent" + description="The Service Binding Set defines all bindings of a profile. It inherits the standard bindings from the Service Binding Manager and defines a port offset and overridden and additional bindings." createDeletePolicy="both"> + + <operation name="displayBindings" displayName="Display Bindings" description="Displays the full set of bindings as they would look if this bindings set was active."> + <results> + <c:list-property name="resultingBindings" readOnly="true" required="false" displayName="Resulting Bindings" + description="In this list you can review the resulting bindings of this binding set. This list includes the override bindings defined for this binding set and the standard bindings as they would look if this binding set was active (i.e. the port offset and default host name applied where appropriate)."> + <c:map-property name="binding" readOnly="true"> + <c:simple-property readOnly="true" name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/> + <c:simple-property readOnly="true" name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/> + <c:simple-property readOnly="true" name="port" type="integer" displayName="Port" description="The port to use for the binding."/> + <c:simple-property readOnly="true" name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/> + <c:simple-property readOnly="true" name="description" required="false" displayName="Description" description="Description of the binding"/> + <c:simple-property readOnly="true" name="fullyQualifiedName" required="false" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <metric property="name" displayName="Name" dataType="trait" displayType="summary" description="The name of this binding set."/> + <metric property="defaultHostName" dataType="trait" displayName="Default Host Name" displayType="summary" description="The default host name of this binding set." /> + <metric property="portOffset" dataType="trait" displayName="Port Offset" displayType="summary" description="The port offset of this binding set."/> + + <resource-configuration> + <c:simple-property name="name" readOnly="true" description="The name of this binding set."/> + <c:simple-property name="defaultHostName" description='The host name that should be used for all bindings whose configuration does not specify "fixed host name".'/> + <c:simple-property name="portOffset" type="integer" description="A value to add to the port configuration for a standard binding to derive the port to use in this binding set. This doesn't apply to standard bindings defined as 'fixed port'."> + <c:constraint> + <c:integer-constraint minimum="0"/> + <c:integer-constraint maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:list-property name="overrideBindings" description='The binding configurations that apply only to this binding set, either non-standard bindings or ones that override standard binding configurations. + The binding set inherits the standard bindings from the Service Binding Manager, applies the port offset to them (unless the standard binding is defined as "fixed port"), and appends the override + bindings. These can either redefine a standard binding or define a brand new binding. The standard bindings and the override bindings then define the + full set of the bindings that are defined by the binding set.'> + <c:map-property name="binding"> + <c:simple-property name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/> + <c:simple-property name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/> + <c:simple-property name="port" type="integer" displayName="Port" description="The port to use for the binding."> + <c:constraint> + <c:integer-constraint minimum="0"/> + <c:integer-constraint maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/> + <c:simple-property name="description" required="false" displayName="Description" description="Description of the binding"/> + <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/> + </c:map-property> + </c:list-property> + </resource-configuration> + </service> + </service> + + </server> + +</plugin> commit 2e7221e4b2697352bca163ac0a1200b62d0e4ff8 Author: Bryan Kearney <bkearney(a)redhat.com> Date: Mon Feb 1 11:10:04 2010 -0500 Use stars to blank out the password, not the zeros diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java index 5dadd14..cb09997 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -48,14 +48,14 @@ public class JlinePromptInfo implements PromptInput { while (true) { // get the answer the first time - input = agent.getIn().readLine('0'); + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); // get the answer a second time agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)) ; agent.getOut().println() ; - String confirmation = agent.getIn().readLine('0'); - agent.getOut().println() ; - agent.getOut().println() ; + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println() ; // make sure the first and second answers match; otherwise, ask again if (input.equals(confirmation)) { commit d19bacd67e857e52428144ab28af5a0c44956df3 Author: Bryan Kearney <bkearney(a)redhat.com> Date: Mon Feb 1 10:52:57 2010 -0500 Fix the native cleanup so that it will not echo password and will use jline diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 0d900d4..e2c6440 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -816,22 +816,7 @@ public class AgentMain { * @return object that can be used to read input with the typed data being echoed or not */ public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); + return new JlinePromptInfo(this) ; } /** diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java index 287421d..b1cc009 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java @@ -30,7 +30,9 @@ import org.rhq.enterprise.communications.util.prefs.PromptInput; * will do the same as {@link #readLine()}). * * @author John Mazzitelli + * @deprecated */ +@Deprecated public class AgentNativePromptInfo implements PromptInput { private final SystemInfo systemInfo; private final AgentMain agent; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..5dadd14 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + input = agent.getIn().readLine('0'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)) ; + agent.getOut().println() ; + String confirmation = agent.getIn().readLine('0'); + agent.getOut().println() ; + agent.getOut().println() ; + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println() ; + } + + return input; + } +} \ No newline at end of file commit ec8807ad7cf9b987f9c7356ed7b50136ef9f503d Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jan 31 00:06:30 2010 -0500 eliminate references to old ojdbc14 library (ojdbc5 is used exclusively everywhere now) diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index f644344..a0481b7 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -143,7 +143,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml"> <property name="settings.localRepository" value="${settings.localRepository}" /> -  <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -175,7 +174,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine"> <property name="settings.localRepository" value="${settings.localRepository}" /> -  <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -208,7 +206,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema"> <property name="settings.localRepository" value="${settings.localRepository}" /> -  <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -248,7 +245,6 @@ </systemProperties>  <additionalClasspathElements> -  <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml index 5fcc174..76d2c07 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml @@ -54,7 +54,6 @@ To run the default target, you must set one of the following properties to true: unless="dbsetup-init-taskdefs.notrequired"> <path id="full.task.classpath"> <pathelement path="${task.classpath.property}" /> -  <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/> <pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/> <pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/> @@ -306,7 +305,6 @@ To run the default target, you must set one of the following properties to true: print="true" showheaders="false"> <classpath> -  <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/> <pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/> <pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 6bb8118..45241fe 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -231,7 +231,6 @@ </systemProperties>  <additionalClasspathElements> -  <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 41e0119..39c7122 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -170,7 +170,6 @@  <property name="rhq.version" value="${project.version}" /> <property name="jboss.version" value="${jboss.version}" /> -  <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -319,8 +318,6 @@ <fileset dir="${deployment.dir}/bin" includes="*.sh" /> <fileset dir="${deployment.dir}/jbossas/bin" includes="*.sh" /> </chmod> -  - <delete verbose="true"><fileset dir="${deployment.dir}/jbossas/server/default/lib" includes="ojdbc14-*.jar" /></delete> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index cd6f94a..b9f4181 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -237,9 +237,6 @@ <property name="jboss.lib.dir" location="${jboss.home}/server/default/lib" /> <echo>Copying additional libs to ${jboss.lib.dir} ...</echo> -  - <delete verbose="true"><fileset dir="${jboss.lib.dir}" includes="ojdbc14-*.jar" /></delete> <copy file="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar" toDir="${jboss.lib.dir}" failonerror="false" verbose="true" /> <copy file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar" diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 8b9a162..1acdb0f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -62,8 +62,8 @@ <configuration> <artifactItems> <artifactItem> - <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> diff --git a/pom.xml b/pom.xml index 2091740..b43da0a 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,6 @@ <jaxb-impl.version>2.1.6</jaxb-impl.version> <jsf-api.version>1.2_14</jsf-api.version> <jsf-impl.version>1.2_14</jsf-impl.version> - <ojdbc14.version>10.2.0.4.0</ojdbc14.version> <ojdbc5.version>11.2.0.1.0</ojdbc5.version> <ems.version>1.2.11</ems.version> <postgresql.version>8.4-701.jdbc3</postgresql.version> @@ -728,13 +727,6 @@ The driver can not be packaged for OpenSource distributions due to licensing issues, and as such, this profile should not be active by default. --> <dependency> - <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> - <version>${ojdbc14.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc5</artifactId> <version>${ojdbc5.version}</version> commit b5db70e718b91679ca57d6a3b92f989add17ca15 Author: Joseph Marques <joseph(a)redhat.com> Date: Sat Jan 30 23:57:46 2010 -0500 update .classpath to point to new generated WS classes diff --git a/.classpath b/.classpath index 43dfd4e..ae63f80 100644 --- a/.classpath +++ b/.classpath @@ -227,7 +227,7 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> - <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-1.4.0-SNAPSHOT/wsconsume-output"/> + <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-3.0.0-SNAPSHOT/wsconsume-output"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/> commit 8fe2633d82206dd8e54ce960d3f6a059cb71f3ca Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Sat Jan 30 11:09:53 2010 -0500 These were only supposed to be disabled in the release-3.0.0.B02 branch. I accidentally merged these into master, so undoing the changes. diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e53b86c..3d05538 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -388,13 +388,11 @@ <version>${project.version}</version> </artifactItem> - </artifactItems> <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 8a38aaf..d9b612e 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -44,10 +44,10 @@ <module>alert-irc</module> <module>alert-mobicents</module> <module>alert-microblog</module> - + <module>alert-roles</module> <module>alert-snmp</module> - - + <module>alert-subject</module> + <module>cobbler</module> <module>validate-all-serverplugins</module> </modules> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index b287a49..a0d4924 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -122,7 +122,7 @@ <module>sshd</module> <module>twitter</module> <module>virt</module> - + <module>kickstart</module>  <module>raw-config-test</module> commit 878bdc5d1bbf9f0ef78e94a27ec9982bf7866a50 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Sat Jan 30 11:04:29 2010 -0500 Updated version from 1.4.0-SNAPSHOT to 3.0.0-SNAPSHOT on files that were missed by maven. diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml index 47da3e5..a6f6552 100644 --- a/etc/apt/pom.xml +++ b/etc/apt/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/etc/modules/base-perspective-war/pom.xml b/etc/modules/base-perspective-war/pom.xml index db49b91..fa64c2f 100644 --- a/etc/modules/base-perspective-war/pom.xml +++ b/etc/modules/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -30,7 +30,7 @@ <seam.version>2.1.0.SP1</seam.version> <jboss-el.version>1.0_02.CR5</jboss-el.version> <richfaces.version>3.3.2.SR1</richfaces.version> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> </properties> <dependencyManagement> diff --git a/etc/samples/custom-serverplugin/pom.xml b/etc/samples/custom-serverplugin/pom.xml index 833ce0c..0adccf6 100644 --- a/etc/samples/custom-serverplugin/pom.xml +++ b/etc/samples/custom-serverplugin/pom.xml @@ -15,7 +15,7 @@ <description>A template for building a custom generic RHQ server plugin</description> <properties> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> </properties> <dependencies> diff --git a/etc/samples/perspectives/sample-perspective/app/pom.xml b/etc/samples/perspectives/sample-perspective/app/pom.xml index bc71b69..7b4c684 100644 --- a/etc/samples/perspectives/sample-perspective/app/pom.xml +++ b/etc/samples/perspectives/sample-perspective/app/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/etc/samples/perspectives/sample-perspective/perspective/pom.xml b/etc/samples/perspectives/sample-perspective/perspective/pom.xml index 85c0c43..8a9587a 100644 --- a/etc/samples/perspectives/sample-perspective/perspective/pom.xml +++ b/etc/samples/perspectives/sample-perspective/perspective/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -21,7 +21,7 @@ <description>A Sample Perspective showing extension points and filters</description> <properties> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> </properties> <dependencies> diff --git a/etc/samples/perspectives/sample-perspective/pom.xml b/etc/samples/perspectives/sample-perspective/pom.xml index 15a7d3b..b3800fe 100644 --- a/etc/samples/perspectives/sample-perspective/pom.xml +++ b/etc/samples/perspectives/sample-perspective/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/etc/samples/simplereport-serverplugin/pom.xml b/etc/samples/simplereport-serverplugin/pom.xml index 48c0f6c..15fcf0a 100644 --- a/etc/samples/simplereport-serverplugin/pom.xml +++ b/etc/samples/simplereport-serverplugin/pom.xml @@ -15,7 +15,7 @@ <description>A RHQ server plugin that periodically outputs a simple report containing some RHQ data</description> <properties> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> </properties> <dependencies> diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml index 517ccf4..95fe7ab 100644 --- a/etc/samples/skeleton-plugin/pom.xml +++ b/etc/samples/skeleton-plugin/pom.xml @@ -15,7 +15,7 @@ <description>A template for building a custom RHQ agent plugin</description> <properties> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> </properties> <dependencies> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index b4adfee..33966bd 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 25a3820..395a90f 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 63c7f6f..b2b2000 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/scripts/pom.xml b/modules/enterprise/remoting/scripts/pom.xml index 77f416c..cbe2b82 100644 --- a/modules/enterprise/remoting/scripts/pom.xml +++ b/modules/enterprise/remoting/scripts/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-cli-scripts</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 833d0d4..366df51 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 4059073..cd58ba5 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 4ee342f..41e0119 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/license-gen/jar/pom.xml b/modules/enterprise/server/license-gen/jar/pom.xml index 4509742..ca17646 100644 --- a/modules/enterprise/server/license-gen/jar/pom.xml +++ b/modules/enterprise/server/license-gen/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/license-gen/maven-plugin/pom.xml b/modules/enterprise/server/license-gen/maven-plugin/pom.xml index ef9261c..bf1c453 100644 --- a/modules/enterprise/server/license-gen/maven-plugin/pom.xml +++ b/modules/enterprise/server/license-gen/maven-plugin/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 106738b..a8038d0 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml index 651ef3e..0932415 100644 --- a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml +++ b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 13b3b95..ec8ba7a 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 6244a23..03d11eb 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -6,14 +6,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 8d1fbe0..3c03600 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/jopr/pom.xml b/modules/jopr/pom.xml index a7a3a0a..d96100b 100644 --- a/modules/jopr/pom.xml +++ b/modules/jopr/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> @@ -37,7 +37,7 @@ <properties> <rhq.groupId>org.rhq</rhq.groupId> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> + <rhq.version>3.0.0-SNAPSHOT</rhq.version> <rhq.product.name>RHQ</rhq.product.name> <rhq.earName>rhq.ear</rhq.earName>  diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 044a682..4f185f4 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hardware/pom.xml b/modules/plugins/hardware/pom.xml index cfd2c8c..43c582d 100644 --- a/modules/plugins/hardware/pom.xml +++ b/modules/plugins/hardware/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml index 8cb587c..d2b6ff6 100644 --- a/modules/plugins/iptables/pom.xml +++ b/modules/plugins/iptables/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 2387c28..30dcae2 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -21,7 +21,7 @@ <properties> <scm.module.path>TODO</scm.module.path> - <rhq.version>1.4.0-SNAPSHOT</rhq.version>  + <rhq.version>3.0.0-SNAPSHOT</rhq.version>  </properties> <build> diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml index 6dbc2e5..b21740c 100644 --- a/modules/plugins/jdbctrace/pom.xml +++ b/modules/plugins/jdbctrace/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml index 40a62f7..ac4ec8d 100644 --- a/modules/plugins/jira/pom.xml +++ b/modules/plugins/jira/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 793526f..a235ca5 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml index 79bb3c5..c579da0 100644 --- a/modules/plugins/lsof/pom.xml +++ b/modules/plugins/lsof/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml index 2d43189..7bfced6 100644 --- a/modules/plugins/onewire/pom.xml +++ b/modules/plugins/onewire/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml index 1380cd6..3ef276d 100644 --- a/modules/plugins/services/pom.xml +++ b/modules/plugins/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> commit 46b90519efbddcdb76eceb5975e65df1c61f824b Merge: ce22709... c5016af... Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:59:32 2010 -0500 Merge branch 'release-3.0.0.B02' commit c5016af353693702aebc3738ba56b12c152f0fea Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:54:54 2010 -0500 [maven-release-plugin] prepare for next development iteration diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 5296c36..a0318ae 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4907dd1..e9f0385 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bea5d99..df2ae07 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 838dc99..a51f92b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 64f2813..f644344 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 67064be..6bb8118 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 07b2073..b84e35d 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7ef6a19..52e1c8a 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c906f58..aa65b2a 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5f22be6..4c39807 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 33541f0..7739177 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 1dc0afd..4d6fe6c 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 404a091..82b73a5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d64c339..bc41dc5 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 85166a0..471f9a8 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0b117cc..8942239 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65f7143..0aaed65 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index 1341bfa..b7e8205 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index d3cbb02..df05645 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 183ea37..9606079 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 21f1f18..0da70b7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index abe772a..a4b964b 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 62ea35f..ac493e8 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0fd92ea..82e5209 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..e53b86c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ac6f806..55187c0 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa1dcd2..7ce91d7 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index bb5bc44..17c9bf2 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 4f910b4..bb06d2e 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index fa2d402..7c7feca 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index a49edcc..f2748f0 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 27a6030..683c392 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4d3ea91..92bd271 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index ff01e3d..4ac7ecf 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index adb8593..5a78451 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..8a38aaf 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e73e8cd..767c55a 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index b1125e4..c9dc974 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index f442331..a48ac7b 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 85fdd07..62997ce 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 48010d6..06c8981 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index ca9092a..aa278b8 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fd7eb3f..4db329f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5e4719f..ffae346 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 30e28b2..f9dde4c 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6d9fe29..4a31a97 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 436b3c8..a0721a9 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index adb6099..5d327ee 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 5c9cee3..c37598e 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 18b0cde..a6e1257 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index cadda62..5734463 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dba6371..d920440 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 2d3dc26..d5aaad5 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 5fc8d0a..30889f7 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0180960..a827e5a 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 105842d..acb08ef 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..7dd0fde 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..2454b97 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..853c020 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..71e31b1 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..b9ed2b3 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..223253e 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..443e524 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..ac9885a 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..d0c9053 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..58087fa 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..8b9a162 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..39c75da 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..97b83b0 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..b287a49 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..283ab6a 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..5a4466c 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..ee16983 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..a190dcd 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..8f4e675 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..0d41574 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..7719b14 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..2ae47bc 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..3265757 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..9f8f36b 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..41df1b8 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..205d5b0 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..63e472f 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..35435b9 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..e62f28b 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..a484e8f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..2235687 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..7310e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 1a007833a958b56095a1e8ec7cb3e22bc5ef525b Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:54:37 2010 -0500 [maven-release-plugin] prepare release rhq_3_0_0_B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit 15a3e1323e40c58987cc4be429f5adf665e28f9a Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:46:58 2010 -0500 Revert "[maven-release-plugin] prepare release release-3.0.0.B02" This reverts commit 98545553b6f09abb33dafd6bce6e19373072b60a. diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 5296c36..b2ae8b3 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4907dd1..db6da1b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,10 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bea5d99..733c5a6 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 838dc99..c9bad5f 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 64f2813..1053bb4 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 67064be..53d16e5 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 07b2073..2873697 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7ef6a19..7c0cf34 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c906f58..57aea6d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5f22be6..6285a42 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 33541f0..3b6807e 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 1dc0afd..056b66e 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 404a091..4ed8447 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d64c339..d167757 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 85166a0..33060fb 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0b117cc..110a4bb 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65f7143..9145d7d 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index 1341bfa..fc78342 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index d3cbb02..4bbad94 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 183ea37..111a873 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 21f1f18..c9e59f1 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index abe772a..912b70a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 62ea35f..30c6d11 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0fd92ea..0ba712c 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..e35b882 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -127,8 +130,11 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -469,19 +475,30 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> + <copy + todir="${deployment.dir}" + verbose="${rhq.verbose}"> + <fileset + dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> + <property + name="deployment.descriptor.file" + location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${deployment.descriptor.file}" /> + <touch + file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -494,9 +511,12 @@ <phase>package</phase> <configuration> <tasks> - <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> + <unjar + src="${project.build.directory}/${project.build.finalName}.ear" + dest="${rhq.deploymentDir}"> <patternset> - <include name="META-INF/**" /> + <include + name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -511,9 +531,12 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> + <delete + dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ac6f806..310da9f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -598,20 +598,38 @@ <phase>compile</phase> <configuration> <tasks> - <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> - <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> - <property name="maven.compile.classpath" refid="maven.compile.classpath" /> - - <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> + <property + name="javadoc.outputDirectory" + value="${javadoc.outputDirectory}" /> + <property + name="project.dir" + value="./src/main/java/org/rhq/enterprise/server" /> + <property + name="maven.compile.classpath" + refid="maven.compile.classpath" /> + + <javadoc + destdir="${javadoc.outputDirectory}/remote-api" + author="true" + version="true" + windowtitle="Remote API" + noindex="false"> <classpath> - <pathelement path="${maven.compile.classpath}" /> + <pathelement + path="${maven.compile.classpath}" /> </classpath> - <fileset dir="${project.dir}" defaultexcludes="yes"> - <include name="**/*Remote.java" /> + <fileset + dir="${project.dir}" + defaultexcludes="yes"> + <include + name="**/*Remote.java" /> </fileset> - <link href="../domain" /> - <link href="../plugin-api" /> - <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link + href="../domain" /> + <link + href="../plugin-api" /> + <link + href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa1dcd2..8f8fc49 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,7 +135,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index bb5bc44..4c30009 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 4f910b4..106dba4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,7 +137,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index fa2d402..0d01adc 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,7 +129,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index a49edcc..ebbf9e4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 27a6030..7b55beb 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -141,7 +141,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4d3ea91..b85fa4e 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -149,7 +149,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index ff01e3d..95a206a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,7 +91,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index adb8593..01ce0b1 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..cee3a94 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e73e8cd..3cac2a1 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -278,7 +278,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index b1125e4..ec50822 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -162,7 +162,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index f442331..994e6c7 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 85fdd07..d77f11e 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -148,7 +148,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 48010d6..8cb3509 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index ca9092a..231d633 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fd7eb3f..9723986 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5e4719f..07962d2 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 30e28b2..dbf2bad 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6d9fe29..5bc551f 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 436b3c8..6731258 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index adb6099..a3a0aea 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 5c9cee3..f04f6ae 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 18b0cde..3b90680 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index cadda62..855db73 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dba6371..dec5fa7 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 2d3dc26..af77bc8 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 5fc8d0a..bb727ff 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0180960..653743b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 105842d..a4c8281 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..2d7452d 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..d58d385 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..d881d22 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..1fba8eb 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..6ab67a4 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..0925bc3 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..17f57ed 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..9ecf2e6 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..3b3fa9b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..522ba54 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..9020061 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..6a140f1 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..0e315da 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..ff5acc4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..a2d3272 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..60eef55 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..616c093 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..7fe965a 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..d1376a8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..2cb7586 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..ccb3ef0 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,11 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,10 +95,11 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <mkdir dir="${rhq.deploymentDir}"/> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> </tasks> </configuration> <goals> @@ -107,14 +112,18 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**" /> + <include name="META-INF/**"/> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> @@ -128,9 +137,10 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}" /> + <delete file="${deployment.file}"/> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..b58e0fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..06b1317 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..28fbed5 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..1d8c64e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..4451d05 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..c44f7cf 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..4ce0286 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..50453bd 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..c5cfd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 98545553b6f09abb33dafd6bce6e19373072b60a Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:45:40 2010 -0500 [maven-release-plugin] prepare release release-3.0.0.B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit 842f7b45265b0d0ae83a7d89ba656ed77cf94f5f Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:39:25 2010 -0500 Revert "[maven-release-plugin] prepare release release-3.0.0.B02" This reverts commit 7d5e9438352280e0c5cbcde701e94ee38e62301e. diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 5296c36..b2ae8b3 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4907dd1..db6da1b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,10 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bea5d99..733c5a6 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 838dc99..c9bad5f 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 64f2813..1053bb4 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 67064be..53d16e5 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 07b2073..2873697 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7ef6a19..7c0cf34 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c906f58..57aea6d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5f22be6..6285a42 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 33541f0..3b6807e 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 1dc0afd..056b66e 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 404a091..4ed8447 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d64c339..d167757 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 85166a0..33060fb 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0b117cc..110a4bb 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65f7143..9145d7d 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index 1341bfa..fc78342 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index d3cbb02..4bbad94 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 183ea37..111a873 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 21f1f18..c9e59f1 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index abe772a..912b70a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 62ea35f..30c6d11 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0fd92ea..0ba712c 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..e35b882 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -127,8 +130,11 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -469,19 +475,30 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> + <copy + todir="${deployment.dir}" + verbose="${rhq.verbose}"> + <fileset + dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> + <property + name="deployment.descriptor.file" + location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${deployment.descriptor.file}" /> + <touch + file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -494,9 +511,12 @@ <phase>package</phase> <configuration> <tasks> - <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> + <unjar + src="${project.build.directory}/${project.build.finalName}.ear" + dest="${rhq.deploymentDir}"> <patternset> - <include name="META-INF/**" /> + <include + name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -511,9 +531,12 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> + <delete + dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ac6f806..310da9f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -598,20 +598,38 @@ <phase>compile</phase> <configuration> <tasks> - <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> - <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> - <property name="maven.compile.classpath" refid="maven.compile.classpath" /> - - <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> + <property + name="javadoc.outputDirectory" + value="${javadoc.outputDirectory}" /> + <property + name="project.dir" + value="./src/main/java/org/rhq/enterprise/server" /> + <property + name="maven.compile.classpath" + refid="maven.compile.classpath" /> + + <javadoc + destdir="${javadoc.outputDirectory}/remote-api" + author="true" + version="true" + windowtitle="Remote API" + noindex="false"> <classpath> - <pathelement path="${maven.compile.classpath}" /> + <pathelement + path="${maven.compile.classpath}" /> </classpath> - <fileset dir="${project.dir}" defaultexcludes="yes"> - <include name="**/*Remote.java" /> + <fileset + dir="${project.dir}" + defaultexcludes="yes"> + <include + name="**/*Remote.java" /> </fileset> - <link href="../domain" /> - <link href="../plugin-api" /> - <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link + href="../domain" /> + <link + href="../plugin-api" /> + <link + href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa1dcd2..8f8fc49 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,7 +135,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index bb5bc44..4c30009 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 4f910b4..106dba4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,7 +137,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index fa2d402..0d01adc 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,7 +129,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index a49edcc..ebbf9e4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 27a6030..7b55beb 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -141,7 +141,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4d3ea91..b85fa4e 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -149,7 +149,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index ff01e3d..95a206a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,7 +91,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index adb8593..01ce0b1 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..cee3a94 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e73e8cd..3cac2a1 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -278,7 +278,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index b1125e4..ec50822 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -162,7 +162,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index f442331..994e6c7 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 85fdd07..d77f11e 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -148,7 +148,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 48010d6..8cb3509 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index ca9092a..231d633 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fd7eb3f..9723986 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5e4719f..07962d2 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 30e28b2..dbf2bad 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6d9fe29..5bc551f 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 436b3c8..6731258 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index adb6099..a3a0aea 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 5c9cee3..f04f6ae 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 18b0cde..3b90680 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index cadda62..855db73 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dba6371..dec5fa7 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 2d3dc26..af77bc8 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 5fc8d0a..bb727ff 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0180960..653743b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 105842d..a4c8281 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..2d7452d 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..d58d385 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..d881d22 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..1fba8eb 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..6ab67a4 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..0925bc3 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..17f57ed 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..9ecf2e6 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..3b3fa9b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..522ba54 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..9020061 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..6a140f1 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..0e315da 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..ff5acc4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..a2d3272 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..60eef55 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..616c093 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..7fe965a 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..d1376a8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..2cb7586 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..ccb3ef0 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,11 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,10 +95,11 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <mkdir dir="${rhq.deploymentDir}"/> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> </tasks> </configuration> <goals> @@ -107,14 +112,18 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**" /> + <include name="META-INF/**"/> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> @@ -128,9 +137,10 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}" /> + <delete file="${deployment.file}"/> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..b58e0fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..06b1317 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..28fbed5 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..1d8c64e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..4451d05 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..c44f7cf 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..4ce0286 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..50453bd 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..c5cfd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 7d5e9438352280e0c5cbcde701e94ee38e62301e Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:34:37 2010 -0500 [maven-release-plugin] prepare release release-3.0.0.B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit c1a2728c3ca3949a61f1323032c2719cd9f37159 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:27:32 2010 -0500 Revert "[maven-release-plugin] prepare release release-3.0.0.B02" This reverts commit 86c0917eb66a4f98f4737810f9fa4f5ffefc5997. diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 5296c36..b2ae8b3 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4907dd1..db6da1b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,10 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bea5d99..733c5a6 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 838dc99..c9bad5f 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 64f2813..1053bb4 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 67064be..53d16e5 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 07b2073..2873697 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7ef6a19..7c0cf34 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c906f58..57aea6d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5f22be6..6285a42 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 33541f0..3b6807e 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 1dc0afd..056b66e 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 404a091..4ed8447 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d64c339..d167757 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 85166a0..33060fb 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0b117cc..110a4bb 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65f7143..9145d7d 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index 1341bfa..fc78342 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index d3cbb02..4bbad94 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 183ea37..111a873 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 21f1f18..c9e59f1 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index abe772a..912b70a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 62ea35f..30c6d11 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0fd92ea..0ba712c 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..e35b882 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -127,8 +130,11 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -469,19 +475,30 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> + <copy + todir="${deployment.dir}" + verbose="${rhq.verbose}"> + <fileset + dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> + <property + name="deployment.descriptor.file" + location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${deployment.descriptor.file}" /> + <touch + file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -494,9 +511,12 @@ <phase>package</phase> <configuration> <tasks> - <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> + <unjar + src="${project.build.directory}/${project.build.finalName}.ear" + dest="${rhq.deploymentDir}"> <patternset> - <include name="META-INF/**" /> + <include + name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -511,9 +531,12 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> + <delete + dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ac6f806..310da9f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -598,20 +598,38 @@ <phase>compile</phase> <configuration> <tasks> - <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> - <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> - <property name="maven.compile.classpath" refid="maven.compile.classpath" /> - - <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> + <property + name="javadoc.outputDirectory" + value="${javadoc.outputDirectory}" /> + <property + name="project.dir" + value="./src/main/java/org/rhq/enterprise/server" /> + <property + name="maven.compile.classpath" + refid="maven.compile.classpath" /> + + <javadoc + destdir="${javadoc.outputDirectory}/remote-api" + author="true" + version="true" + windowtitle="Remote API" + noindex="false"> <classpath> - <pathelement path="${maven.compile.classpath}" /> + <pathelement + path="${maven.compile.classpath}" /> </classpath> - <fileset dir="${project.dir}" defaultexcludes="yes"> - <include name="**/*Remote.java" /> + <fileset + dir="${project.dir}" + defaultexcludes="yes"> + <include + name="**/*Remote.java" /> </fileset> - <link href="../domain" /> - <link href="../plugin-api" /> - <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link + href="../domain" /> + <link + href="../plugin-api" /> + <link + href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa1dcd2..8f8fc49 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,7 +135,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index bb5bc44..4c30009 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 4f910b4..106dba4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,7 +137,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index fa2d402..0d01adc 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,7 +129,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index a49edcc..ebbf9e4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 27a6030..7b55beb 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -141,7 +141,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4d3ea91..b85fa4e 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -149,7 +149,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index ff01e3d..95a206a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,7 +91,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index adb8593..01ce0b1 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..cee3a94 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e73e8cd..3cac2a1 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -278,7 +278,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index b1125e4..ec50822 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -162,7 +162,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index f442331..994e6c7 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 85fdd07..d77f11e 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -148,7 +148,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 48010d6..8cb3509 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index ca9092a..231d633 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fd7eb3f..9723986 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5e4719f..07962d2 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 30e28b2..dbf2bad 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6d9fe29..5bc551f 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 436b3c8..6731258 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index adb6099..a3a0aea 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 5c9cee3..f04f6ae 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 18b0cde..3b90680 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index cadda62..855db73 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dba6371..dec5fa7 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 2d3dc26..af77bc8 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 5fc8d0a..bb727ff 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0180960..653743b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 105842d..a4c8281 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..2d7452d 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..d58d385 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..d881d22 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..1fba8eb 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..6ab67a4 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..0925bc3 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..17f57ed 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..9ecf2e6 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..3b3fa9b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..522ba54 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..9020061 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..6a140f1 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..0e315da 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..ff5acc4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..a2d3272 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..60eef55 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..616c093 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..7fe965a 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..d1376a8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..2cb7586 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..ccb3ef0 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,11 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,10 +95,11 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <mkdir dir="${rhq.deploymentDir}"/> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> </tasks> </configuration> <goals> @@ -107,14 +112,18 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**" /> + <include name="META-INF/**"/> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> @@ -128,9 +137,10 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}" /> + <delete file="${deployment.file}"/> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..b58e0fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..06b1317 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..28fbed5 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..1d8c64e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..4451d05 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..c44f7cf 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..4ce0286 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..50453bd 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..c5cfd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 86c0917eb66a4f98f4737810f9fa4f5ffefc5997 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:25:37 2010 -0500 [maven-release-plugin] prepare release release-3.0.0.B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit d7ac5c332e5227bae9a4458096bdd8ecd90138dc Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:17:38 2010 -0500 Revert "[maven-release-plugin] prepare release release-3.0.0.B02" This reverts commit 01e084d18dd8aa3aea4a9f9cc14a31298592f7c3. diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 5296c36..b2ae8b3 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4907dd1..db6da1b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,10 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bea5d99..733c5a6 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 838dc99..c9bad5f 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 64f2813..1053bb4 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 67064be..53d16e5 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 07b2073..2873697 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7ef6a19..7c0cf34 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c906f58..57aea6d 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5f22be6..6285a42 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 33541f0..3b6807e 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 1dc0afd..056b66e 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 404a091..4ed8447 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d64c339..d167757 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 85166a0..33060fb 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 0b117cc..110a4bb 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65f7143..9145d7d 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index 1341bfa..fc78342 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index d3cbb02..4bbad94 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 183ea37..111a873 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 21f1f18..c9e59f1 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index abe772a..912b70a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 62ea35f..30c6d11 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0fd92ea..0ba712c 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..e35b882 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -127,8 +130,11 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -469,19 +475,30 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="${earDirectory}/license" /> - <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <mkdir + dir="${earDirectory}/license" /> + <copy + todir="${earDirectory}/license" + file="${basedir}/src/main/license/license.xml" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> + <copy + todir="${deployment.dir}" + verbose="${rhq.verbose}"> + <fileset + dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> + <property + name="deployment.descriptor.file" + location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${deployment.descriptor.file}" /> + <touch + file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -494,9 +511,12 @@ <phase>package</phase> <configuration> <tasks> - <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> + <unjar + src="${project.build.directory}/${project.build.finalName}.ear" + dest="${rhq.deploymentDir}"> <patternset> - <include name="META-INF/**" /> + <include + name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -511,9 +531,12 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property + name="deployment.dir" + location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> + <delete + dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ac6f806..310da9f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -598,20 +598,38 @@ <phase>compile</phase> <configuration> <tasks> - <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> - <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> - <property name="maven.compile.classpath" refid="maven.compile.classpath" /> - - <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> + <property + name="javadoc.outputDirectory" + value="${javadoc.outputDirectory}" /> + <property + name="project.dir" + value="./src/main/java/org/rhq/enterprise/server" /> + <property + name="maven.compile.classpath" + refid="maven.compile.classpath" /> + + <javadoc + destdir="${javadoc.outputDirectory}/remote-api" + author="true" + version="true" + windowtitle="Remote API" + noindex="false"> <classpath> - <pathelement path="${maven.compile.classpath}" /> + <pathelement + path="${maven.compile.classpath}" /> </classpath> - <fileset dir="${project.dir}" defaultexcludes="yes"> - <include name="**/*Remote.java" /> + <fileset + dir="${project.dir}" + defaultexcludes="yes"> + <include + name="**/*Remote.java" /> </fileset> - <link href="../domain" /> - <link href="../plugin-api" /> - <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link + href="../domain" /> + <link + href="../plugin-api" /> + <link + href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa1dcd2..8f8fc49 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,7 +135,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index bb5bc44..4c30009 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 4f910b4..106dba4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,7 +137,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index fa2d402..0d01adc 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,7 +129,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index a49edcc..ebbf9e4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,7 +136,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 27a6030..7b55beb 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -141,7 +141,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4d3ea91..b85fa4e 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -149,7 +149,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index ff01e3d..95a206a 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,7 +91,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index adb8593..01ce0b1 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..cee3a94 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,11 +1,14 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e73e8cd..3cac2a1 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -278,7 +278,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index b1125e4..ec50822 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -162,7 +162,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index f442331..994e6c7 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 85fdd07..d77f11e 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -148,7 +148,8 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 48010d6..8cb3509 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index ca9092a..231d633 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fd7eb3f..9723986 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5e4719f..07962d2 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 30e28b2..dbf2bad 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6d9fe29..5bc551f 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 436b3c8..6731258 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index adb6099..a3a0aea 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 5c9cee3..f04f6ae 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 18b0cde..3b90680 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index cadda62..855db73 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dba6371..dec5fa7 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 2d3dc26..af77bc8 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 5fc8d0a..bb727ff 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0180960..653743b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 105842d..a4c8281 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..2d7452d 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..d58d385 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..d881d22 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..1fba8eb 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..6ab67a4 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..0925bc3 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..17f57ed 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..9ecf2e6 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..3b3fa9b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..522ba54 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..9020061 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..6a140f1 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..0e315da 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..ff5acc4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..a2d3272 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..60eef55 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..616c093 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..7fe965a 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..d1376a8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..2cb7586 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..ccb3ef0 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,11 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,10 +95,11 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <mkdir dir="${rhq.deploymentDir}"/> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> </tasks> </configuration> <goals> @@ -107,14 +112,18 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**" /> + <include name="META-INF/**"/> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> @@ -128,9 +137,10 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}" /> + <delete file="${deployment.file}"/> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..b58e0fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..06b1317 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..28fbed5 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..1d8c64e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..4451d05 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..c44f7cf 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..4ce0286 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..50453bd 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..c5cfd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 01e084d18dd8aa3aea4a9f9cc14a31298592f7c3 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:15:27 2010 -0500 [maven-release-plugin] prepare release release-3.0.0.B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit ce22709b260f1c6dd6135691b46b0fcc699da07c Author: Bryan Kearney <bkearney(a)redhat.com> Date: Fri Jan 29 14:52:42 2010 -0500 Modify the AgentMain to use jline Consoles instead of reading from standard in. The big benefit is to be able to use command history in the agent diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml index 0b5db52..ec28381 100644 --- a/modules/enterprise/agent/ant-run.xml +++ b/modules/enterprise/agent/ant-run.xml @@ -34,6 +34,7 @@ ANT Script that provides ways to package the agent. <include name="javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" /> <include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" /> <include name="log4j/log4j/1.2.14/log4j-1.2.14.jar" /> + <include name="jline/jline/${jline.version}/jline-${jline.version}.jar" /> <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" /> <include name="gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" /> <include name="commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar" /> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..b4607c8 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -58,6 +58,12 @@ <artifactId>rhq-core-client-api</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>${jline.version}</version> + </dependency> <dependency>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 371cd50..2d7452d 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 3683c8a..d58d385 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d5f8bff..d881d22 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 40bfa3c..1fba8eb 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 33a9093..6ab67a4 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0fa6dd6..0925bc3 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 1e1de1b..17f57ed 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 489f41b..9ecf2e6 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 191ee7f..3b3fa9b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 2473ad0..522ba54 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index c6d73ea..9020061 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 5ddc63d..6a140f1 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 890cb37..0e315da 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,11 +1,12 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b576109..ff5acc4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index ba192ed..a2d3272 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index bf5fd7e..60eef55 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b9ad068..616c093 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 942f0c3..7fe965a 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 66ff40d..d1376a8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4fa8404..2cb7586 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 45b019d..ccb3ef0 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,11 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> @@ -91,10 +95,11 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <mkdir dir="${rhq.deploymentDir}"/> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> </tasks> </configuration> <goals> @@ -107,14 +112,18 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**" /> + <include name="META-INF/**"/> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> </jar> </tasks> </configuration> @@ -128,9 +137,10 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}" /> + <delete file="${deployment.file}"/> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2628a22..b58e0fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c86264a..06b1317 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 24ca4b4..28fbed5 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 80a46b6..1d8c64e 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 3b580a5..4451d05 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 8f86288..c44f7cf 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index b5636f1..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index a08dd62..4ce0286 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0341956..50453bd 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 74d8bb7..c5cfd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B02</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit dbfab54407c2ac21b205d8613c004e6c01676d2d Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:06:09 2010 -0500 Revert "Revert "Disabled plugins not included in the release."" This reverts commit 8d9448bdf2ab04e98f7e8f5fc72ea204e507786b. diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 5c340da..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -388,11 +388,13 @@ <version>${project.version}</version> </artifactItem> + </artifactItems> <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 1cf0e56..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -44,10 +44,10 @@ <module>alert-irc</module> <module>alert-mobicents</module> <module>alert-microblog</module> - <module>alert-roles</module> + <module>alert-snmp</module> - <module>alert-subject</module> - <module>cobbler</module> + + <module>validate-all-serverplugins</module> </modules> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 7ce4db9..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -122,7 +122,7 @@ <module>sshd</module> <module>twitter</module> <module>virt</module> - <module>kickstart</module> +  <module>raw-config-test</module> commit 8d9448bdf2ab04e98f7e8f5fc72ea204e507786b Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:05:13 2010 -0500 Revert "Disabled plugins not included in the release." This reverts commit 27d82989f75572f8c6ab6d4c28eef63aeca5ad37. diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e9611ed..5c340da 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -388,13 +388,11 @@ <version>${project.version}</version> </artifactItem> - </artifactItems> <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 216e9a9..1cf0e56 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -44,10 +44,10 @@ <module>alert-irc</module> <module>alert-mobicents</module> <module>alert-microblog</module> - + <module>alert-roles</module> <module>alert-snmp</module> - - + <module>alert-subject</module> + <module>cobbler</module> <module>validate-all-serverplugins</module> </modules> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dae1f06..7ce4db9 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -122,7 +122,7 @@ <module>sshd</module> <module>twitter</module> <module>virt</module> - + <module>kickstart</module>  <module>raw-config-test</module> commit 4b6c11cadd890fec762cec9de5a73760c8ca31f1 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 15:00:24 2010 -0500 [maven-release-plugin] prepare release release-3.0.0.B02 diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2ae8b3..5296c36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index db6da1b..4907dd1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -1,11 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 733c5a6..bea5d99 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index c9bad5f..838dc99 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 1053bb4..64f2813 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..67064be 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2873697..07b2073 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7c0cf34..7ef6a19 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 57aea6d..c906f58 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 6285a42..5f22be6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 3b6807e..33541f0 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 056b66e..1dc0afd 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4ed8447..404a091 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d167757..d64c339 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 33060fb..85166a0 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 110a4bb..0b117cc 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 9145d7d..65f7143 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/alert-migration/pom.xml b/modules/enterprise/gui/alert-migration/pom.xml index fc78342..1341bfa 100644 --- a/modules/enterprise/gui/alert-migration/pom.xml +++ b/modules/enterprise/gui/alert-migration/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 4bbad94..d3cbb02 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..183ea37 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index c9e59f1..21f1f18 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..abe772a 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 30c6d11..62ea35f 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 0ba712c..0fd92ea 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index e35b882..e9611ed 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -130,11 +127,8 @@ <phase>generate-sources</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> </tasks> </configuration> <goals> @@ -475,30 +469,19 @@ <phase>package</phase> <configuration> <tasks> - <mkdir - dir="${earDirectory}/license" /> - <copy - todir="${earDirectory}/license" - file="${basedir}/src/main/license/license.xml" /> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <mkdir dir="${earDirectory}/license" /> + <copy todir="${earDirectory}/license" file="${basedir}/src/main/license/license.xml" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy - todir="${deployment.dir}" - verbose="${rhq.verbose}"> - <fileset - dir="${basedir}/target/${project.build.finalName}" /> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property - name="deployment.descriptor.file" - location="${deployment.dir}/META-INF/application.xml" /> + <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" /> <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch - file="${deployment.descriptor.file}" /> + <touch file="${deployment.descriptor.file}" /> </tasks> </configuration> <goals> @@ -511,12 +494,9 @@ <phase>package</phase> <configuration> <tasks> - <unjar - src="${project.build.directory}/${project.build.finalName}.ear" - dest="${rhq.deploymentDir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> - <include - name="META-INF/**" /> + <include name="META-INF/**" /> </patternset> </unjar> </tasks> @@ -531,12 +511,9 @@ <phase>clean</phase> <configuration> <tasks> - <property - name="deployment.dir" - location="${rhq.deploymentDir}" /> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete - dir="${deployment.dir}" /> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..ac6f806 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -598,38 +598,20 @@ <phase>compile</phase> <configuration> <tasks> - <property - name="javadoc.outputDirectory" - value="${javadoc.outputDirectory}" /> - <property - name="project.dir" - value="./src/main/java/org/rhq/enterprise/server" /> - <property - name="maven.compile.classpath" - refid="maven.compile.classpath" /> - - <javadoc - destdir="${javadoc.outputDirectory}/remote-api" - author="true" - version="true" - windowtitle="Remote API" - noindex="false"> + <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> + <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> + <property name="maven.compile.classpath" refid="maven.compile.classpath" /> + + <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="true" version="true" windowtitle="Remote API" noindex="false"> <classpath> - <pathelement - path="${maven.compile.classpath}" /> + <pathelement path="${maven.compile.classpath}" /> </classpath> - <fileset - dir="${project.dir}" - defaultexcludes="yes"> - <include - name="**/*Remote.java" /> + <fileset dir="${project.dir}" defaultexcludes="yes"> + <include name="**/*Remote.java" /> </fileset> - <link - href="../domain" /> - <link - href="../plugin-api" /> - <link - href="http://java.sun.com/j2se/1.5.0/docs/api/" /> + <link href="../domain" /> + <link href="../plugin-api" /> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/" /> <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved. ]]></bottom> </javadoc> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 8f8fc49..aa1dcd2 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Email Alert Plugin</name> @@ -135,8 +135,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 4c30009..bb5bc44 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 106dba4..4f910b4 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> @@ -137,8 +137,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0d01adc..fa2d402 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> @@ -129,8 +129,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index ebbf9e4..a49edcc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> @@ -136,8 +136,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7b55beb..27a6030 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -141,8 +141,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b85fa4e..4d3ea91 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -149,8 +149,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 95a206a..ff01e3d 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -91,8 +91,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 01ce0b1..adb8593 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index cee3a94..216e9a9 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -1,14 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 3cac2a1..e73e8cd 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -278,8 +278,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ec50822..b1125e4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -162,8 +162,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 994e6c7..f442331 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index d77f11e..85fdd07 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -148,8 +148,7 @@ <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 8cb3509..48010d6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 231d633..ca9092a 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9723986..fd7eb3f 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 07962d2..5e4719f 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index dbf2bad..30e28b2 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5bc551f..6d9fe29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> @@ -16,7 +16,7 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <scm> <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 6731258..436b3c8 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index a3a0aea..adb6099 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index f04f6ae..5c9cee3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 3b90680..18b0cde 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 855db73..cadda62 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index dec5fa7..dba6371 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index af77bc8..2d3dc26 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb727ff..5fc8d0a 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 653743b..0180960 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a4c8281..105842d 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2d7452d..371cd50 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index d58d385..3683c8a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index d881d22..d5f8bff 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 1fba8eb..40bfa3c 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 6ab67a4..33a9093 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 0925bc3..0fa6dd6 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 17f57ed..1e1de1b 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9ecf2e6..489f41b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 3b3fa9b..191ee7f 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 522ba54..2473ad0 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9020061..c6d73ea 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 6a140f1..5ddc63d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 0e315da..890cb37 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index e80ee68..dae1f06 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -1,12 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index ff5acc4..b576109 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a2d3272..ba192ed 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 60eef55..bf5fd7e 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq.plugins</groupId> <artifactId>raw-config-test</artifactId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 616c093..b9ad068 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fe965a..942f0c3 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d1376a8..66ff40d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 2cb7586..4fa8404 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index ccb3ef0..45b019d 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -1,15 +1,11 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> @@ -95,11 +91,10 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${rhq.deploymentDir}"/> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -112,18 +107,14 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -137,10 +128,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> - <delete file="${deployment.file}"/> + <delete file="${deployment.file}" /> </tasks> </configuration> <goals> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index b58e0fd..2628a22 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 06b1317..c86264a 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 28fbed5..24ca4b4 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1d8c64e..80a46b6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 4451d05..3b580a5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index c44f7cf..8f86288 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 37d2f9f..b5636f1 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> diff --git a/modules/pom.xml b/modules/pom.xml index 4ce0286..a08dd62 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 50453bd..0341956 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index c5cfd44..74d8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>3.0.0.B02</version> <packaging>pom</packaging> <name>RHQ</name> commit 27d82989f75572f8c6ab6d4c28eef63aeca5ad37 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Fri Jan 29 14:54:42 2010 -0500 Disabled plugins not included in the release. diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 3faa62b..e35b882 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -394,11 +394,13 @@ <version>${project.version}</version> </artifactItem> + </artifactItems> <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index fdc6870..cee3a94 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -47,10 +47,10 @@ <module>alert-irc</module> <module>alert-mobicents</module> <module>alert-microblog</module> - <module>alert-roles</module> + <module>alert-snmp</module> - <module>alert-subject</module> - <module>cobbler</module> + + <module>validate-all-serverplugins</module> </modules> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index d6aeb76..e80ee68 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -123,7 +123,7 @@ <module>sshd</module> <module>twitter</module> <module>virt</module> - <module>kickstart</module> +  <module>raw-config-test</module> commit 7a6feaf85bd7ecc5ca9e26a1b62aa79e96519bf0 Author: Bryan Kearney <bkearney(a)redhat.com> Date: Fri Jan 29 13:24:23 2010 -0500 Can delete and destroy virtual machines now diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index f3ff3f6..37d2f9f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -22,7 +22,7 @@ <properties> <scm.module.path>modules/plugins/virt/</scm.module.path> - <libvirt-java.version>0.3.2</libvirt-java.version> + <libvirt-java.version>0.4.1</libvirt-java.version> </properties> <dependencies> diff --git a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java index 6d71936..fd54ef8 100644 --- a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java +++ b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.sun.jna.Pointer; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.libvirt.Connect; @@ -30,6 +32,8 @@ import org.libvirt.DomainBlockStats; import org.libvirt.DomainInterfaceStats; import org.libvirt.LibvirtException; import org.libvirt.Network; +import org.libvirt.DomainInfo.DomainState; +import org.libvirt.jna.virError; /** * Represents a connection, via libVirt to domain management. @@ -48,11 +52,10 @@ public class LibVirtConnection { public LibVirtConnection(String uri) throws LibvirtException { try { - //Connect.setErrorCallback(Logger.INSTANCE); - //Connect.setErrorCallback(null); + Connect.setErrorCallback(Logger.INSTANCE); connection = new Connect(uri); connected = true; - //connection.setConnectionErrorCallback(Logger.INSTANCE); + connection.setConnectionErrorCallback(Logger.INSTANCE); } catch (LibvirtException e) { log.warn("Can not obtain an instance of libvirt"); connection = null; @@ -66,7 +69,7 @@ public class LibVirtConnection { throw ie; }*/ } finally { - //Connect.setErrorCallback(null); + Connect.setErrorCallback(null); } } @@ -157,11 +160,28 @@ public class LibVirtConnection { return SUCCESS; } + public int domainDestroy(String domainName) throws LibvirtException { + Domain domain = connection.domainLookupByName(domainName); + domain.destroy() ; + return SUCCESS; + } + + public int domainDelete(String domainName) throws LibvirtException { + Domain domain = connection.domainLookupByName(domainName); + DomainState state = domain.getInfo().state ; + + if ((state != DomainState.VIR_DOMAIN_SHUTDOWN) && (state != DomainState.VIR_DOMAIN_SHUTOFF)) { + domain.destroy() ; + } + domain.undefine() ; + return SUCCESS; + } + public int domainSave(String domainName, String toPath) throws LibvirtException { Domain domain = connection.domainLookupByName(domainName); domain.save(toPath); return SUCCESS; - } + } public int domainResume(String domainName) throws LibvirtException { Domain domain = connection.domainLookupByName(domainName); @@ -327,7 +347,7 @@ public class LibVirtConnection { } } //TODO Put the callbacks in -/* Comment this out untilt he callbacks get in +/* Comment this out untilt he callbacks get in*/ class Logger extends org.libvirt.ErrorCallback { // Make this static so the callback will always have an object @@ -338,6 +358,6 @@ class Logger extends org.libvirt.ErrorCallback { @Override public void errorCallback(Pointer arg0, virError arg1) { - log.warn(arg1.message); + log.warn("Libvirt Error: " + arg1.message); } -} */ \ No newline at end of file +} \ No newline at end of file diff --git a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java index ccb006a..a67d5c3 100644 --- a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java +++ b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java @@ -35,6 +35,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.inventory.CreateResourceReport; +import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; @@ -49,7 +50,7 @@ import org.rhq.core.pluginapi.operation.OperationResult; * @author Greg Hinkle */ public class VirtualizationDomainComponent implements ResourceComponent<VirtualizationHostComponent>, MeasurementFacet, - OperationFacet, ConfigurationFacet, CreateChildResourceFacet { + OperationFacet, ConfigurationFacet, CreateChildResourceFacet, DeleteResourceFacet { private Log log = LogFactory.getLog(VirtualizationDomainComponent.class); private String domainName; @@ -131,8 +132,10 @@ public class VirtualizationDomainComponent implements ResourceComponent<Virtuali result = virt.domainShutdown(this.domainName); } else if (name.equals("suspend")) { result = virt.domainSuspend(this.domainName); - } else if (name.equals("create")) { + } else if (name.equals("start")) { result = virt.domainCreate(this.domainName); + } else if (name.equals("destroy")) { + result = virt.domainDestroy(this.domainName); } if (result < 0) { @@ -144,16 +147,6 @@ public class VirtualizationDomainComponent implements ResourceComponent<Virtuali public Configuration loadResourceConfiguration() throws LibvirtException { LibVirtConnection virt = getConnection(); - /*Configuration config = new Configuration(); - DomainInfo info = virt.getDomainInfo(domainName); - //TODO Type - //TODO Lifecycle Actions - config.put(new PropertySimple("name", info.name)); - config.put(new PropertySimple("uuid", info.uuid)); - config.put(new PropertySimple("vcpu", info.domainInfo.nrVirtCpu)); - config.put(new PropertySimple("memory", info.domainInfo.maxMem)); - config.put(new PropertySimple("currentMemory", info.domainInfo.memory)); - return config;*/ String xml = virt.getDomainXML(this.domainName); return XMLEditor.getDomainConfiguration(xml); @@ -218,4 +211,9 @@ public class VirtualizationDomainComponent implements ResourceComponent<Virtuali public String getDomainName() { return this.domainName; } + + public void deleteResource() throws Exception { + LibVirtConnection virt = this.getConnection() ; + virt.domainDelete(domainName) ; + } } \ No newline at end of file diff --git a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java index 6059db5..eb0c089 100644 --- a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java +++ b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; diff --git a/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml index 18cd70a..39d0cf9 100644 --- a/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml @@ -42,7 +42,7 @@ class="VirtualizationDomainComponent" createDeletePolicy="both" creationDataType="configuration"> - <operation name="create" + <operation name="start" description="Launch a defined domain. If the call succeed the domain moves from the defined to the running domains pools."/> <operation name="reboot" description="Reboot a domain, the domain object is still usable there after but the domain OS is being stopped for a restart. Note that the guest OS may ignore the request."/> @@ -62,7 +62,9 @@ </parameters> </operation> <operation name="shutdown" - description="Shutdown a domain, the domain object is still usable there after but the domain OS is being stopped. Note that the guest OS may ignore the request. TODO: should we add an option for reboot, knowing it may not be doable in the general case ?"/> + description="Shutdown a domain, the domain object is still usable there after but the domain OS is being stopped. Note that the guest OS may ignore the request. "/> + <operation name="destroy" + description="Force a shutdown right now."/> <metric property="cpuPercentage" displayName="CPU Usage" units="percentage" displayType="summary"/> <metric property="memoryUsage" displayName="Memory Usage" units="kilobytes" displayType="summary"/> commit 987ee2cf875b01c80d4ff671d1a5abf154042529 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Jan 29 02:54:50 2010 -0500 fixes BZ#548526 and obsoletes BZ#559160 - when changing config of server plugin, plugin is hot-redeployed and other HA servers will pick up the chanage within a few minutes at most diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java b/modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java index 4a8f9f5..6aaf7cf 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java @@ -229,6 +229,15 @@ import org.rhq.core.domain.configuration.Configuration; + " WHERE p.id IN (:ids) " // + " AND p.status = 'INSTALLED' "), // + // returns two epoch millis - when plugin config and schedule jobs were last changed + @NamedQuery(name = ServerPlugin.QUERY_GET_CONFIG_MTIMES, query = "" // + + " SELECT pc.mtime, " // + + " sjc.mtime " // + + " FROM ServerPlugin AS p " // + + " LEFT JOIN p.pluginConfiguration pc " // + + " LEFT JOIN p.scheduledJobsConfiguration sjc " // + + " WHERE p.id = :id"), // + // this query is how you enable and disable plugins @NamedQuery(name = ServerPlugin.UPDATE_PLUGIN_ENABLED_BY_ID, query = "" // + "UPDATE ServerPlugin p " // @@ -250,6 +259,7 @@ public class ServerPlugin extends AbstractPlugin { public static final String QUERY_FIND_ALL_INSTALLED = "ServerPlugin.findAllInstalled"; public static final String QUERY_FIND_ALL_INSTALLED_KEYS = "ServerPlugin.findAllInstalledKeys"; public static final String QUERY_FIND_KEYS_BY_IDS = "ServerPlugin.findKeysByIds"; + public static final String QUERY_GET_CONFIG_MTIMES = "ServerPlugin.getConfigMTimes"; public static final String UPDATE_PLUGIN_ENABLED_BY_ID = "ServerPlugin.updatePluginEnabledById"; @JoinColumn(name = "JOBS_CONFIG_ID", referencedColumnName = "ID") diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java index 1e52b62..4ec9271 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java @@ -85,6 +85,12 @@ public class ServerPluginTest extends AbstractEJB3Test { assert plugin.getPluginConfiguration() == null : "there was no config that should have been here"; assert plugin.getScheduledJobsConfiguration() == null : "there was no config that should have been here"; + q = em.createNamedQuery(ServerPlugin.QUERY_GET_CONFIG_MTIMES); + q.setParameter("id", plugin.getId()); + Object[] times = (Object[]) q.getSingleResult(); + assert times[0] == null; + assert times[1] == null; + q = em.createNamedQuery(ServerPlugin.QUERY_GET_STATUS_BY_NAME); q.setParameter("name", plugin.getName()); assert ((PluginStatusType) q.getSingleResult()) == PluginStatusType.INSTALLED; @@ -270,6 +276,7 @@ public class ServerPluginTest extends AbstractEJB3Test { } } + @SuppressWarnings("unchecked") public void testPersistFull() throws Exception { getTransactionManager().begin(); EntityManager em = getEntityManager(); @@ -410,6 +417,14 @@ public class ServerPluginTest extends AbstractEJB3Test { assert allKeys.size() == 1; assert allKeys.contains(new PluginKey(plugin)); + query = em.createNamedQuery(ServerPlugin.QUERY_GET_CONFIG_MTIMES); + query.setParameter("id", plugin.getId()); + Object[] times = (Object[]) query.getSingleResult(); + assert times[0] != null; + assert times[1] != null; + assert ((Long) times[0]).longValue() > 0; + assert ((Long) times[1]).longValue() > 0; + // mark a plugin deleted - all of our queries should then never see it plugin.setStatus(PluginStatusType.DELETED); em.merge(plugin); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java index 34b24a6..ad6c709 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java @@ -112,16 +112,13 @@ public class EditPluginConfigurationUIBean extends AbstractPluginConfigurationUI ServerPlugin plugin = serverPlugins.updateServerPluginExceptContent(subject, getPlugin()); setPlugin(plugin); - // the config has changed. we would like to restart the plugin, but we would need to ensure - // ALL servers in the rhq server cloud restart. today we have no easy way to inform all servers - // that they should do this. So, for now, disable the plugin (since if it is running, it is doing - // so with a now-invalid configuration. Let the user go in and re-enable the plugin later. - // TODO: right now, if the user re-enables the plugin too fast, some of the other servers - // will not have seen the state change and won't restart the plugin. Need a way to do this... - // perhaps use the mtime column to denote that state changed (this would affect whether or not - // the plugin needs to be upgraded, so we need to be careful re-using the mtime column for this purpose). + // Since the config has changed, we can tell the server to re-load the plugin now + // in order for it to pick up the changes immediately. Any other servers in the HA Server Cloud + // will pick up these changes later, when they scan for changes in the database. + // Note that if the plugin is disabled, don't bother since the plugin isn't really running anyway. if (plugin.isEnabled()) { - serverPlugins.disableServerPlugins(subject, getPluginIdList()); + // enabling an already enabled plugin forces the plugin to reload + serverPlugins.enableServerPlugins(subject, getPluginIdList()); } FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Configuration settings saved."); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java index a58afb2..6b15cdc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java @@ -106,11 +106,11 @@ public class ServerPluginScanner { List<ServerPlugin> allPlugins = serverPluginsManager.getAllServerPlugins(); List<ServerPlugin> installedPlugins = new ArrayList<ServerPlugin>(); List<ServerPlugin> undeployedPlugins = new ArrayList<ServerPlugin>(); - for (ServerPlugin allPlugin : allPlugins) { - if (allPlugin.getStatus() == PluginStatusType.INSTALLED) { - installedPlugins.add(allPlugin); + for (ServerPlugin plugin : allPlugins) { + if (plugin.getStatus() == PluginStatusType.INSTALLED) { + installedPlugins.add(plugin); } else { - undeployedPlugins.add(allPlugin); + undeployedPlugins.add(plugin); } } @@ -130,16 +130,33 @@ public class ServerPluginScanner { } // now see if any plugins changed state from enabled->disabled or vice versa + // this also checks to see if the plugin configuration has changed since it was last loaded MasterServerPluginContainer master = LookupUtil.getServerPluginService().getMasterPluginContainer(); if (master != null) { for (ServerPlugin installedPlugin : installedPlugins) { PluginKey key = PluginKey.createServerPluginKey(installedPlugin.getType(), installedPlugin.getName()); AbstractTypeServerPluginContainer pc = master.getPluginContainerByPlugin(key); if (pc != null && pc.isPluginLoaded(key)) { + boolean needToReloadPlugin = false; boolean currentlyEnabled = pc.isPluginEnabled(key); if (installedPlugin.isEnabled() != currentlyEnabled) { - log.info("Detected a change to plugin [" + key + "]. It will now be " + log.info("Detected a state change to plugin [" + key + "]. It will now be " + ((installedPlugin.isEnabled()) ? "[enabled]" : "[disabled]")); + needToReloadPlugin = true; + } else { + Long pluginLoadTime = pc.getPluginLoadTime(key); + if (pluginLoadTime != null) { + long configChangeTimestamp = serverPluginsManager + .getLastConfigurationChangeTimestamp(installedPlugin.getId()); + if (configChangeTimestamp > pluginLoadTime.longValue()) { + // since the last time the plugin was loaded, its configuration has changed, reload it to pick up the new config + log.info("Detected a config change to plugin [" + key + "]. It will be reloaded and " + + ((installedPlugin.isEnabled()) ? "[enabled]" : "[disabled]")); + needToReloadPlugin = true; + } + } + } + if (needToReloadPlugin) { pc.reloadPlugin(key, installedPlugin.isEnabled()); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java index 4d7d590..a4103c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java @@ -147,6 +147,23 @@ public class ServerPluginsBean implements ServerPluginsLocal { return query.getResultList(); } + @SuppressWarnings("unchecked") + public long getLastConfigurationChangeTimestamp(int pluginId) { + Query query = entityManager.createNamedQuery(ServerPlugin.QUERY_GET_CONFIG_MTIMES); + query.setParameter("id", pluginId); + Object[] timestamps = (Object[]) query.getSingleResult(); + long lastConfigChangeTimestamp = 0L; + for (Object timestamp : timestamps) { + if (timestamp != null) { + long val = ((Long) timestamp).longValue(); + if (val > lastConfigChangeTimestamp) { + lastConfigChangeTimestamp = val; + } + } + } + return lastConfigChangeTimestamp; + } + public ServerPluginDescriptorType getServerPluginDescriptor(PluginKey pluginKey) throws Exception { ServerPlugin plugin = getServerPlugin(pluginKey); File pluginsDir = LookupUtil.getServerPluginService().getServerPluginsDirectory(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java index 6a81f29..830b2c5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java @@ -90,6 +90,17 @@ public interface ServerPluginsLocal { List<ServerPlugin> getAllServerPluginsById(List<Integer> pluginIds); /** + * Given a plugin ID, this will return a timestamp (in epoch millis) + * that indicates the last time when the plugin's configuration changed. + * This looks at both plugin configuration and schedule job configuration. + * + * @param pluginId + * @return time when the plugin's configuration was last updated; will be 0 + * if the plugin has no configuration to change. + */ + long getLastConfigurationChangeTimestamp(int pluginId); + + /** * Given a plugin key, returns the descriptor for that plugin. * * @param pluginKey diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java index f845715..b8e760c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java @@ -20,7 +20,10 @@ package org.rhq.enterprise.server.plugin.pc; import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,6 +51,11 @@ public abstract class AbstractTypeServerPluginContainer { private ServerPluginManager pluginManager; /** + * Maps the time (in epoch milliseconds) when plugins were loaded in this plugin container. + */ + private final Map<PluginKey, Long> loadedTimestamps; + + /** * Instantiates the plugin container. All subclasses must support this and only this * constructor. * @@ -55,6 +63,7 @@ public abstract class AbstractTypeServerPluginContainer { */ public AbstractTypeServerPluginContainer(MasterServerPluginContainer master) { this.master = master; + this.loadedTimestamps = Collections.synchronizedMap(new HashMap<PluginKey, Long>()); } /** @@ -111,6 +120,17 @@ public abstract class AbstractTypeServerPluginContainer { } /** + * Given a plugin key, this returns the time (in epoch milliseconds) when that plugin was loaded into + * this plugin container. + * + * @param pluginKey identifies the plugin whose load time is to be returned + * @return the epoch millis timestamp when the plugin was loaded; <code>null</code> if the plugin is not loaded + */ + public Long getPluginLoadTime(PluginKey pluginKey) { + return this.loadedTimestamps.get(pluginKey); + } + + /** * The initialize method that prepares the plugin container. This should get the plugin * container ready to accept plugins. * @@ -185,6 +205,7 @@ public abstract class AbstractTypeServerPluginContainer { public synchronized void loadPlugin(ServerPluginEnvironment env, boolean enabled) throws Exception { if (this.pluginManager != null) { this.pluginManager.loadPlugin(env, enabled); + this.loadedTimestamps.put(env.getPluginKey(), System.currentTimeMillis()); } else { throw new Exception("Cannot load a plugin; plugin container is not initialized yet"); } @@ -201,6 +222,7 @@ public abstract class AbstractTypeServerPluginContainer { public synchronized void unloadPlugin(PluginKey pluginKey) throws Exception { if (this.pluginManager != null) { this.pluginManager.unloadPlugin(pluginKey.getPluginName(), false); + this.loadedTimestamps.remove(pluginKey); } else { throw new Exception("Cannot unload a plugin; plugin container has been shutdown"); } @@ -218,6 +240,7 @@ public abstract class AbstractTypeServerPluginContainer { public synchronized void reloadPlugin(PluginKey pluginKey, boolean enabled) throws Exception { if (this.pluginManager != null) { this.pluginManager.reloadPlugin(pluginKey.getPluginName(), enabled); + this.loadedTimestamps.put(pluginKey, System.currentTimeMillis()); } else { throw new Exception("Cannot reload a plugin; plugin container has been shutdown"); } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java index e1738e5..935721c 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java @@ -144,6 +144,12 @@ public class ServerPluginsBeanTest extends AbstractEJB3Test { assert plugins.contains(p2) : plugins; assetLazyInitializationException(plugins.get(plugins.indexOf(p1))); assetLazyInitializationException(plugins.get(plugins.indexOf(p2))); + + long lastTimestamp; + lastTimestamp = this.serverPluginsBean.getLastConfigurationChangeTimestamp(p1.getId()); + assert lastTimestamp == getConfigurationLastModifiedTimestamp(p1); + lastTimestamp = this.serverPluginsBean.getLastConfigurationChangeTimestamp(p2.getId()); + assert lastTimestamp == getConfigurationLastModifiedTimestamp(p2); } public void testUpdatePlugins() throws Exception { @@ -393,4 +399,22 @@ public class ServerPluginsBeanTest extends AbstractEJB3Test { getTransactionManager().rollback(); } } + + private long getConfigurationLastModifiedTimestamp(ServerPlugin plugin) { + // determine the last time the plugin config or schedule jobs changed + // return 0 value if plugin doesn't have any config whatsoever + long timestamp = 0; + + Configuration config = plugin.getPluginConfiguration(); + if (config != null) { + timestamp = config.getModifiedTime(); + } + + config = plugin.getScheduledJobsConfiguration(); + if (config != null && config.getModifiedTime() > timestamp) { + timestamp = config.getModifiedTime(); + } + + return timestamp; + } }

1 0

[rhq] Branch 'raw-config' - 7 commits - modules/enterprise modules/plugins
by John Sanda 03 Feb '10

03 Feb '10

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java | 54 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java | 287 ++++------ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 265 +++++++++ modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml | 2 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml | 19 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml | 126 ++-- modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml | 46 - modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy | 2 modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy | 2 13 files changed, 511 insertions(+), 316 deletions(-) New commits: commit 9639d79f1b5ee0cfe90b89ad8849dd94838a05fb Merge: 48dc406... ced3c1b... Author: John Sanda <john(a)localhost.localdomain> Date: Wed Feb 3 11:02:41 2010 -0500 Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config diff --cc modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java index 9d43732,ebb3bc6..bcedcfb --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java @@@ -313,10 -328,9 +328,9 @@@ public class ExistingResourceConfigurat if (editedRaw.getSha256().equals(originalRaw.getSha256())) { --numberOfModifiedFiles; RawConfigUIBean rawUIBean = findRawConfigUIBeanByPath(editedRaw.getPath()); - rawUIBean.setModified(false); +// rawUIBean.setModified(false); getModified().remove(editedRaw.getPath()); - } - else { + } else { ++numberOfModifiedFiles; } return null; commit 48dc40645ddd0a062e0b7c599f2771bd086769d6 Author: John Sanda <john(a)localhost.localdomain> Date: Wed Feb 3 10:53:01 2010 -0500 Adding and updating support for undo operation in ResourceConfigurationEditor and in edit.xhtml The undo operation through the file menu now works for resources that support structured and raw configuration. The code changes still need to be applied to raw-only. I had to refactor the file menu JSF code a bit. First, the file menu item is now omitted and has been replaced with a <h:outputLabel>. The undo button was previously rendered with <h:commandButton> and used <a4j:support>. It is now rendered with <aj4:button>. These changes allow for each component to respond separately to mouse clicks and the a4j button allows for an ajax request to be sent instead of a full post-back. Ajax requests should be possible using, <h:commandButton> <a4j:support/> </h:commandButton> but for some reason it was causing full post-backs. I also encounted some seam-related exceptions involving concurrent request timeouts for the same conversation. It is not clear why those exceptions were getting thrown, but they were causing the undo operatin to break. Specifying the concurrent-request-timeout attribute for the edit.xhtml page navigation declaration in pages.xml resolved that issue. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 5ba82bc..475ed1a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -63,7 +63,10 @@ public class RawConfigUIBean { } public void undoEdit() { - rawConfiguration = originalRawConfiguration.deepCopy(false); + Configuration configuration = rawConfiguration.getConfiguration(); + configuration.removeRawConfiguration(rawConfiguration); + rawConfiguration = originalRawConfiguration.deepCopy(true); + configuration.addRawConfiguration(rawConfiguration); } /** @return The full path name of the raw config file */ diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml index cfdb513..eec0dd8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml @@ -17,7 +17,7 @@ <page view-id="/rhq/resource/configuration/view-map.xhtml" action="#{configurationViewer.initialize}"/> - <page view-id="/rhq/resource/configuration/edit.xhtml"> + <page view-id="/rhq/resource/configuration/edit.xhtml" concurrent-request-timeout="3000"> <action execute="#{configurationEditor.initialize}" on-postback="false"/> <begin-conversation join="true"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml index b520d47..266b97a 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml @@ -234,8 +234,6 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1"> <rich:panel id="fileMenuPanel" style="width:100%"> <f:facet name="header">Files</f:facet> - - <rich:panelMenu id="fileMenu" mode="ajax" expandMode="client" @@ -247,24 +245,22 @@ THIS TEXT WILL BE REMOVED. expanded="true" selectedChild="#{selectedRawUIBean.path}"> <c:forEach items="#{rawConfigDir.rawConfigUIBeans}" var="rawConfigUIBean"> - <rich:panelMenuItem label="#{rawConfigUIBean.fileName}" - icon="#{rawConfigUIBean.icon}" - onclick="cursor_wait();" - oncomplete="cursor_clear();" - action="#{configurationEditor.select(rawConfigUIBean.path)}" - limitToList="true" - reRender="fileContents,selectedFileHeader,modalEditor,fileMenu"> + <rich:panelMenuItem label="" + icon="#{rawConfigUIBean.icon}"> <h:panelGroup> - <h:outputText value="#{#rawConfigUIBean.fileName}"/> - <h:commandButton value="Undo" - styleClass="buttonmed" - rendered="#{rawConfigUIBean.modified}"> + <h:outputLabel value="#{rawConfigUIBean.fileName}"> <a4j:support event="onclick" - onsumbit="cursor_wait()" + onsubmit="cursor_wait()" oncomplete="cursor_clear()" - action="#{configurationEditor.undoEdit(rawConfigUIBean.path)}" - reRender="fileMenu,fileContents"/> - </h:commandButton> + action="#{configurationEditor.select(rawConfigUIBean.path)}" + limitToList="true" + reRender="fileContents,selectedFileHeader,modalEditor,fileMenuPanel"/> + </h:outputLabel> + <a4j:commandButton value="Undo" + styleClass="buttonmed" + rendered="#{rawConfigUIBean.modified}" + action="#{configurationEditor.undoEdit(rawConfigUIBean.path)}" + reRender="fileMenuPanel,fileContents"/> </h:panelGroup> </rich:panelMenuItem> </c:forEach> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml index 889436f..a76af3f 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml @@ -195,7 +195,7 @@ THIS TEXT WILL BE REMOVED. onlabelclick="cursor_wait();" oncomplete="cursor_clear();" limitToList="true" - reRender="upperEditButton,lowerEditStructuredButton,lowerEditRawButton,fileUpload,upperCommitPanel,lowerCommitPanel"> + reRender="upperEditButton,lowerEditStructuredButton,lowerEditRawButton"> <h:outputText value=" #{messages.nopermissionedit}" rendered="#{!ResourceUIBean.permissions.configure}"/> commit 285dbe27561d19dea8bd1929ea3a489863463111 Author: John Sanda <john(a)localhost.localdomain> Date: Tue Feb 2 17:01:50 2010 -0500 Adding ResourceConfigurationEditor.undoEdit() and corresponding method in RawConfigUIBean diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 9a0fab5..5ba82bc 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -62,6 +62,10 @@ public class RawConfigUIBean { Events.instance().raiseEvent("rawConfigUpdate", this); } + public void undoEdit() { + rawConfiguration = originalRawConfiguration.deepCopy(false); + } + /** @return The full path name of the raw config file */ public String getPath() { return rawConfiguration.getPath(); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index 4339aef..8757de5 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -171,6 +171,15 @@ public class ResourceConfigurationEditor extends ResourceConfigurationViewer { return null; } + public void undoEdit(String path) { + RawConfigUIBean rawConfigUIBean = findRawConfigUIBeanByPath(path); + rawConfigUIBean.undoEdit(); + } + + /** + * + * @return + */ public String finishAddMap() { FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Map added."); return "success"; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml index 031a6ef..b520d47 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml @@ -262,7 +262,7 @@ THIS TEXT WILL BE REMOVED. <a4j:support event="onclick" onsumbit="cursor_wait()" oncomplete="cursor_clear()" - action="#{ExistingResourceConfigurationUIBean.undoEdit(rawConfigUIBean.path)}" + action="#{configurationEditor.undoEdit(rawConfigUIBean.path)}" reRender="fileMenu,fileContents"/> </h:commandButton> </h:panelGroup> commit 8af8a03f6d51cfc5b0d26a8f9b5f8a22a63d0ba9 Author: John Sanda <john(a)localhost.localdomain> Date: Tue Feb 2 15:37:29 2010 -0500 Updating page nav rules and ResourceConfigurationEditor to support adding/editing complex properties diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index f22a56c..4339aef 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -170,4 +170,14 @@ public class ResourceConfigurationEditor extends ResourceConfigurationViewer { return null; } + + public String finishAddMap() { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Map added."); + return "success"; + } + + public String finishEditMap() { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Map updated."); + return "success"; + } } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml index 9313b60..cfdb513 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml @@ -20,6 +20,7 @@ <page view-id="/rhq/resource/configuration/edit.xhtml"> <action execute="#{configurationEditor.initialize}" on-postback="false"/> <begin-conversation join="true"/> + <navigation from-action="#{configurationEditor.updateConfiguration}"> <rule if-outcome="success"> <end-conversation before-redirect="false"/> @@ -28,6 +29,14 @@ </redirect> </rule> </navigation> + + <navigation from-action="#{configurationEditor.finishAddMap}"> + <render view-id="/rhq/resource/configuration/edit.xhtml"/> + </navigation> + + <navigation from-action="#{configurationEditor.finishEditMap}"> + <render view-id="/rhq/resource/configuration/edit.xhtml"/> + </navigation> </page> </pages> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml index e29844c..8253558 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml @@ -27,12 +27,12 @@ THIS TEXT WILL BE REMOVED. <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> - <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" + <onc:config configurationDefinition="#{resourceConfigurationDefinition}" + configuration="#{resourceConfiguration}" listName="#{param.listName}"/> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> - <h:commandButton value="OK" type="submit" action="#{ExistingResourceConfigurationUIBean.finishAddMap}" + <h:commandButton value="OK" type="submit" action="#{configurationEditor.finishAddMap}" alt="Click to Add Map" styleClass="buttonmed"/> <h:commandButton value="RESET" type="reset" immediate="true" alt="Click to Reset Fields" styleClass="buttonmed"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml index 5471be2..46aaed8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml @@ -27,14 +27,14 @@ THIS TEXT WILL BE REMOVED. <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> - <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" + <onc:config configurationDefinition="#{resourceConfigurationDefinition}" + configuration="#{resourceConfiguration}" listName="#{param.listName}" listIndex="#{param.listIndex}" prevalidate="true"/> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> - <h:commandButton value="OK" action="#{ExistingResourceConfigurationUIBean.finishEditMap}" + <h:commandButton value="OK" action="#{configurationEditor.finishEditMap}" alt="Click to Update Map" styleClass="buttonmed"/> <h:commandButton value="RESET" type="reset" immediate="true" alt="Click to Reset Fields" styleClass="buttonmed"/> commit 69d8203b48bc7bbb994f71ec166b0589e051bd1e Author: John Sanda <john(a)localhost.localdomain> Date: Tue Feb 2 14:49:24 2010 -0500 Adding update method to ResourceConfigurationEditor. Also replacing more uses of ExistingResourceConfigurationUIBean with configurationEditor. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java index c563385..e4e3d7e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java @@ -115,16 +115,8 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura * @param contents The new contents */ public void setContents(String contents) { - if (configuration != null) { - configuration.removeRawConfiguration(this); - } - this.contents = contents; updateSha256(); - - if (configuration != null) { - configuration.addRawConfiguration(this); - } } private void updateSha256() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java index a996407..9d43732 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java @@ -313,7 +313,7 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI if (editedRaw.getSha256().equals(originalRaw.getSha256())) { --numberOfModifiedFiles; RawConfigUIBean rawUIBean = findRawConfigUIBeanByPath(editedRaw.getPath()); - rawUIBean.setModified(false); +// rawUIBean.setModified(false); getModified().remove(editedRaw.getPath()); } else { @@ -327,8 +327,8 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI RawConfigUIBean bean = findRawConfigUIBeanByPath(path); if (bean != null) { - bean.setModified(false); - bean.setIcon("/images/blank.png"); +// bean.setModified(false); +// bean.setIcon("/images/blank.png"); } } @@ -496,7 +496,7 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI private void markCurrentRawConfigUIBeanModified() { RawConfigUIBean bean = findRawConfigUIBeanByPath(current.getPath()); if (bean != null) { - bean.setModified(true); +// bean.setModified(true); } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 90ad4d3..9a0fab5 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -24,6 +24,7 @@ package org.rhq.enterprise.gui.configuration.resource; import org.jboss.seam.core.Events; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; import javax.faces.component.NamingContainer; @@ -53,7 +54,11 @@ public class RawConfigUIBean { } public void setContents(String contents) { + Configuration configuration = rawConfiguration.getConfiguration(); + configuration.removeRawConfiguration(rawConfiguration); rawConfiguration.setContents(contents); + configuration.addRawConfiguration(rawConfiguration); + Events.instance().raiseEvent("rawConfigUpdate", this); } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index 6c7eb7f..f22a56c 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -28,11 +28,16 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.web.RequestParameter; +import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; +import org.rhq.core.gui.configuration.ConfigurationMaskingUtility; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; +import javax.faces.application.FacesMessage; import java.util.HashSet; import java.util.Set; @@ -131,4 +136,38 @@ public class ResourceConfigurationEditor extends ResourceConfigurationViewer { return numberOfFilesModified + " files changed in this configuration"; } + + public String updateConfiguration() { + ConfigurationManagerLocal configurationMgr = LookupUtil.getConfigurationManager(); + + ConfigurationMaskingUtility.unmaskConfiguration(resourceConfiguration, resourceConfigurationDefinition); + + AbstractResourceConfigurationUpdate updateRequest = configurationMgr.updateStructuredOrRawConfiguration( + loggedInUser.getSubject(), resourceId, resourceConfiguration, isStructuredMode()); + + if (updateRequest != null) { + switch (updateRequest.getStatus()) { + case SUCCESS: + case INPROGRESS: + FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Configuration update request with id " + + updateRequest.getId() + " has been sent to the Agent."); + return "success"; + case FAILURE: + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Configuration update request with id " + + updateRequest.getId() + " failed.", updateRequest.getErrorMessage()); + return "failure"; + case UNSENT: + FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Configuration update was not valid", + updateRequest.getErrorMessage()); + return "failure"; + } + } + else { + FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, "No changes were made to the configuration, so " + + "no update request has been sent to the Agent."); + return "success"; + } + + return null; + } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java index 3bb7c6c..3cab434 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java @@ -62,7 +62,7 @@ public class ResourceConfigurationViewer { protected Configuration resourceConfiguration; @Out - private ConfigurationDefinition resourceConfigurationDefinition; + protected ConfigurationDefinition resourceConfigurationDefinition; @Out private Collection<RawConfigDirectory> rawConfigDirectories; @@ -181,6 +181,14 @@ public class ResourceConfigurationViewer { /** @return The currently selected tab, structured (i.e., Basic Mode) or raw (i.e., Advanced Mode). */ public String getSelectedTab() { + if (isStructuredSupported()) { + return "structuredTab"; + } + + if (isRawSupported()) { + return "rawTab"; + } + if (mode == STRUCTURED_MODE) { return "structuredTab"; } @@ -213,7 +221,6 @@ public class ResourceConfigurationViewer { protected void changeToStructuredTab() { } - public void select(String path) { selectedRawUIBean = findRawConfigUIBeanByPath(path); } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml index 126fb6f..2042013 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml @@ -12,7 +12,7 @@ <component name="org.jboss.seam.core.init"> <property name="debug">false</property>  <property name="transactionManagementEnabled">false</property> - <property name="jndi-pattern">rhq/#{ejbName}/local</property> + <property name="jndiPattern">rhq/#{ejbName}/local</property> </component> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml index b79dba9..9313b60 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml @@ -20,6 +20,14 @@ <page view-id="/rhq/resource/configuration/edit.xhtml"> <action execute="#{configurationEditor.initialize}" on-postback="false"/> <begin-conversation join="true"/> + <navigation from-action="#{configurationEditor.updateConfiguration}"> + <rule if-outcome="success"> + <end-conversation before-redirect="false"/> + <redirect view-id="/rhq/resource/configuration/history.xhtml"> + <param name="id" value="#{ResourceUIBean.id}"/> + </redirect> + </rule> + </navigation> </page> </pages> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml index 0b9ab22..031a6ef 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml @@ -49,7 +49,7 @@ THIS TEXT WILL BE REMOVED. <h:form id="editResourceConfigurationForm" onsubmit="prepareInputsForSubmission(this)" - rendered="#{!ViewResourceConfigurationUIBean.updateInProgress}"> + rendered="#{!configurationEditor.updateInProgress}"> <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> @@ -61,7 +61,7 @@ THIS TEXT WILL BE REMOVED. style="padding-right:10px" value="#{configurationEditor.modifiedFilesMsg}"/> <h:commandButton value="Commit" - action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" + action="#{configurationEditor.updateConfiguration}" title="Click to Save Changes" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}"/> @@ -70,14 +70,14 @@ THIS TEXT WILL BE REMOVED. </h:panelGrid> <c:choose> - <c:when test="${ExistingResourceConfigurationUIBean.rawSupported}"> + <c:when test="${configurationEditor.rawSupported}"> <rich:tabPanel switchType="ajax" valueChangeListener="changeTabs"> <rich:tab label="Advanced Mode" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> <h:panelGrid columns="2" styleClass="raw-outer-table" columnClasses="raw-outer-table-left-col,raw-outer-table-right-col"> <h:panelGrid columns="1"> - <rich:panel style="width:100%"> + <rich:panel id="fileMenuPanel" style="width:100%"> <f:facet name="header">Files</f:facet> <rich:panelMenu id="fileMenu" @@ -89,18 +89,17 @@ THIS TEXT WILL BE REMOVED. var="rawConfigDir"> <rich:panelMenuGroup label="#{rawConfigDir.path}" expanded="true" - selectedChild="#{ExistingResourceConfigurationUIBean.currentPath}"> + selectedChild="#{selectedRawUIBean.path}"> <c:forEach items="#{rawConfigDir.rawConfigUIBeans}" var="rawConfigUIBean"> <rich:panelMenuItem label="#{rawConfigUIBean.fileName}" icon="#{rawConfigUIBean.icon}" - binding="#{rawConfigUIBean.panelMenuItem}" onclick="cursor_wait();" oncomplete="cursor_clear();" - action="#{ExistingResourceConfigurationUIBean.select(rawConfigUIBean.path)}" + action="#{configurationEditor.select(rawConfigUIBean.path)}" limitToList="true" reRender="fileContents,selectedFileHeader,modalEditor,fileMenu"> <h:panelGroup> - <h:outputText value="#{#rawConfigUIBean.fileName}"/> + <h:outputText value="#{rawConfigUIBean.fileName}"/> <h:commandButton value="Undo" styleClass="buttonmed" rendered="#{rawConfigUIBean.modified}"> @@ -131,38 +130,37 @@ THIS TEXT WILL BE REMOVED. <h:outputLink value="#" onclick="#{rich:component('uploadWindow')}.show()">Upload New</h:outputLink> - <h:commandLink action="#{ExistingResourceConfigurationUIBean.download}" value="Download"> + <h:commandLink action="#{configurationEditor.download}" value="Download"> <h:graphicImage value="/images/download.png"/> <f:param name="id" value="#{ResourceUIBean.id}"/> </h:commandLink> <a4j:status id="selectedFileHeader" - startText="Loading #{ExistingResourceConfigurationUIBean.current.path} ..." - stopText="#{ExistingResourceConfigurationUIBean.current.path}"/> + startText="Loading #{selectedRawUIBean.path} ..." + stopText="#{selectedRawUIBean.path}"/> </h:panelGrid> <rich:panel style="margin-left:1px; border: none;"> <h:inputTextarea id="fileContents" style="width:100%" - value="#{ExistingResourceConfigurationUIBean.currentContents}" + value="#{selectedRawUIBean.contents}" readonly="false"> <a4j:support event="onkeyup" ignoreDupeResponses="true" - reRender="fileMenu" - requestDelay="1000" - action="#{ExistingResourceConfigurationUIBean.editCurrent}"/> + reRender="fileMenuPanel,upperCommitPanel,lowerCommitPanel" + requestDelay="1000"/> </h:inputTextarea> </rich:panel> </h:panelGrid> </h:panelGrid> <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> - <h:panelGroup style="text-align:right"> + <h:panelGroup id="lowerCommitPanel" style="text-align:right"> <h:outputText value="#{configurationEditor.modifiedFilesMsg}" rendered="#{configurationEditor .rawMode}" style="padding-right:10px"/> <h:commandButton value="Commit" - action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" + action="#{configurationEditor.updateConfiguration}" title="Click to Save Changes" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}"/> @@ -172,18 +170,18 @@ THIS TEXT WILL BE REMOVED. </rich:tabPanel> </c:when> - <c:when test="${ExistingResourceConfigurationUIBean.structuredSupported}"> + <c:when test="${configurationEditor.structuredSupported}"> <rich:tabPanel switchType="ajax" valueChangeListener="changeTabs"> <rich:tab label="Basic Mode" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> - <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" - nullConfigurationDefinitionMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationMessage}" + <onc:config configurationDefinition="#{resourceConfigurationDefinition}" + configuration="#{resourceConfiguration}" + nullConfigurationDefinitionMessage="#{msg['resource.configuration.definition.null']}" + nullConfigurationMessage="#{msg['resource.configuration.null']}" prevalidate="true"/> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell" - rendered="#{ExistingResourceConfigurationUIBean.configuration != null}"> - <h:commandButton value="SAVE" action="#{ExistingResourceConfigurationUIBean.updateConfiguration}" + rendered="#{resourceConfiguration != null}"> + <h:commandButton value="SAVE" action="#{configurationEditor.updateConfiguration}" title="Click to Save Changes" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}"/> <h:commandButton value="RESET" type="reset" immediate="true" @@ -193,7 +191,7 @@ THIS TEXT WILL BE REMOVED. </rich:tabPanel> </c:when> - <c:when test="${ExistingResourceConfigurationUIBean.structuredAndRawSupported}"> + <c:when test="${configurationEditor.structuredAndRawSupported}"> <rich:tabPanel id="configTabPanel" selectedTab="#{configurationEditor.selectedTab}" switchType="ajax" @@ -214,7 +212,7 @@ THIS TEXT WILL BE REMOVED. columnClasses="button-cell" rendered="#{resourceConfiguration != null}"> <h:commandButton value="SAVE" - action="#{ExistingResourceConfigurationUIBean.updateConfiguration}" + action="#{configurationEditor.updateConfiguration}" title="Click to Save Changes" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}"/> @@ -247,7 +245,7 @@ THIS TEXT WILL BE REMOVED. var="rawConfigDir"> <rich:panelMenuGroup label="#{rawConfigDir.path}" expanded="true" - selectedChild="#{ExistingResourceConfigurationUIBean.currentPath}"> + selectedChild="#{selectedRawUIBean.path}"> <c:forEach items="#{rawConfigDir.rawConfigUIBeans}" var="rawConfigUIBean"> <rich:panelMenuItem label="#{rawConfigUIBean.fileName}" icon="#{rawConfigUIBean.icon}" @@ -288,14 +286,14 @@ THIS TEXT WILL BE REMOVED. <h:outputLink value="#" onclick="#{rich:component('uploadWindow')}.show()">Upload New</h:outputLink> - <h:commandLink action="#{ExistingResourceConfigurationUIBean.download}" value="Download"> + <h:commandLink action="#{configurationEditor.download}" value="Download"> <h:graphicImage value="/images/download.png"/> <f:param name="id" value="#{ResourceUIBean.id}"/> </h:commandLink> <a4j:status id="selectedFileHeader" - startText="Loading #{ExistingResourceConfigurationUIBean.current.path} ..." - stopText="#{ExistingResourceConfigurationUIBean.current.path}"/> + startText="Loading #{selectedRawUIBean.path} ..." + stopText="#{selectedRawUIBean.path}"/> </h:panelGrid> <rich:panel id="fileContentsPanel" style="margin-left:1px; border: none;"> @@ -318,7 +316,7 @@ THIS TEXT WILL BE REMOVED. rendered="#{configurationEditor.displayChangedFilesLabel}" style="padding-right:10px"/> <h:commandButton value="Commit" - action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" + action="#{configurationEditor.updateConfiguration}" title="Click to Save Changes" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}"/> @@ -334,7 +332,7 @@ THIS TEXT WILL BE REMOVED. </h:form> <h:panelGroup layout="block" styleClass="InfoBlock" - rendered="#{ExistingResourceConfigurationUIBean.updateInProgress}"> + rendered="#{configurationEditor.updateInProgress}"> <b>${msg['note']}</b> ${msg['resource.config.Current.updateInProgress']} </h:panelGroup> </ui:define> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml index 3b05ebb..889436f 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml @@ -212,7 +212,7 @@ THIS TEXT WILL BE REMOVED. var="rawConfigDir"> <rich:panelMenuGroup label="#{rawConfigDir.path}" expanded="true" - selectedChild="#{currentPath}"> + selectedChild="#{selectedRawUIBean.path}"> <c:forEach items="#{rawConfigDir.rawConfigUIBeans}" var="rawConfigUIBean"> <rich:panelMenuItem label="#{rawConfigUIBean.fileName}" icon="/images/blank.png" commit 42af01a4ea5b6c53bb6f433ce6113a7b2ca74c11 Author: John Sanda <john(a)localhost.localdomain> Date: Tue Feb 2 09:21:16 2010 -0500 Refactoring methods for translating between structured and raw and for tracking changes As part of this refactoring, introducing a new class, ResourceConfigurationViewer, which ResourceConfigurationEditor extends. ResourceConfigurationEditor has methods to handle translating between structured and raw. RawConfigUIBean has been refactored such that it encapsulates logic to determinr whether or not the corresponding raw config file is modified. When the file is modified, RawConfigUIBean fires a seam event to inidicate that the file has been updated. ResourceConfigurationEditor subscribes to the event fired by RawConfigUIBean. The event handler method contains logic for tracking the files that are modified. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java index e4e3d7e..c563385 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java @@ -115,8 +115,16 @@ public class RawConfiguration implements Serializable, DeepCopyable<RawConfigura * @param contents The new contents */ public void setContents(String contents) { + if (configuration != null) { + configuration.removeRawConfiguration(this); + } + this.contents = contents; updateSha256(); + + if (configuration != null) { + configuration.addRawConfiguration(this); + } } private void updateSha256() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java index fe346dd..953f0fa 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java @@ -48,8 +48,6 @@ public class RawConfigDirectory { } public void addRawConfig(RawConfiguration rawConfig) { - RawConfigUIBean bean = new RawConfigUIBean(); - bean.setRawConfiguration(rawConfig); - rawConfigUIBeans.add(bean); + rawConfigUIBeans.add(new RawConfigUIBean(rawConfig)); } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 260921d..90ad4d3 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -23,53 +23,29 @@ package org.rhq.enterprise.gui.configuration.resource; +import org.jboss.seam.core.Events; import org.rhq.core.domain.configuration.RawConfiguration; -import org.richfaces.component.html.HtmlPanelMenuItem; import javax.faces.component.NamingContainer; import java.io.File; public class RawConfigUIBean { - private RawConfiguration rawConfiguration; - - private boolean modified; + private RawConfiguration originalRawConfiguration; - private String modifiedContents; - - private HtmlPanelMenuItem panelMenuItem; + private RawConfiguration rawConfiguration; - public RawConfiguration getRawConfiguration() { - return rawConfiguration; + public RawConfigUIBean(RawConfiguration rawConfiguration) { + this.rawConfiguration = rawConfiguration; + originalRawConfiguration = rawConfiguration.deepCopy(false); } public void setRawConfiguration(RawConfiguration rawConfiguration) { this.rawConfiguration = rawConfiguration; } - public HtmlPanelMenuItem getPanelMenuItem() { - return panelMenuItem; - } - - public void setPanelMenuItem(HtmlPanelMenuItem panelMenuItem) { - this.panelMenuItem = panelMenuItem; - } - - public String getModifiedContents() { - return modifiedContents; - } - - public void setModifiedContents(String contents) { - modifiedContents = contents; - } - public boolean isModified() { - return modified; - } - - public void setModified(boolean modified) { - this.modified = modified; - panelMenuItem.setIcon(getIcon()); + return !rawConfiguration.getSha256().equals(originalRawConfiguration.getSha256()); } public String getContents() { @@ -78,6 +54,7 @@ public class RawConfigUIBean { public void setContents(String contents) { rawConfiguration.setContents(contents); + Events.instance().raiseEvent("rawConfigUpdate", this); } /** @return The full path name of the raw config file */ @@ -106,7 +83,4 @@ public class RawConfigUIBean { return "/images/blank.png"; } - public void setIcon(String icon) { - panelMenuItem.setIcon(icon); - } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index 9e5b695..6c7eb7f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -24,228 +24,111 @@ package org.rhq.enterprise.gui.configuration.resource; import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.*; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; +import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.web.RequestParameter; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.configuration.definition.ConfigurationFormat; -import org.rhq.core.gui.configuration.ConfigurationMaskingUtility; -import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.legacy.WebUser; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; -import javax.faces.event.ValueChangeEvent; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.util.*; +import java.util.HashSet; +import java.util.Set; @Name("configurationEditor") @Scope(ScopeType.CONVERSATION) -@Role(name = "configurationViewer", scope = ScopeType.PAGE) -public class ResourceConfigurationEditor { - - private static final boolean STRUCTURED_MODE = true; - private static final boolean RAW_MODE = false; - - private boolean mode = STRUCTURED_MODE; +public class ResourceConfigurationEditor extends ResourceConfigurationViewer { private Configuration originalResourceConfiguration; - @In("webUser") - private WebUser loggedInUser; - - @Out - private Configuration resourceConfiguration; - - @Out - private ConfigurationDefinition resourceConfigurationDefinition; + private int numberOfFilesModified; - @Out - private Collection<RawConfigDirectory> rawConfigDirectories; - - @Out(required = false) - private RawConfigUIBean selectedRawUIBean; - - @RequestParameter("id") - private int resourceId; + private Set<String> modifiedFiles = new HashSet<String>(); @RequestParameter private String tab; - private boolean readOnly = true; - - @Create - public void initialize() { - loadResourceConfigurationDefinition(); - loadResourceConfiguration(); - initRawConfigDirectories(); - + @Override + protected void doInitialization() { if (tab != null) { setSelectedTab(tab); } - } - - private void loadResourceConfigurationDefinition() { - int resourceTypeId = EnterpriseFacesContextUtility.getResource().getResourceType().getId(); - ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - resourceConfigurationDefinition = configurationManager.getResourceConfigurationDefinitionForResourceType( - loggedInUser.getSubject(), resourceTypeId); + originalResourceConfiguration = resourceConfiguration.deepCopy(true); } - private void loadResourceConfiguration() { - Subject subject = loggedInUser.getSubject(); - - ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - - AbstractResourceConfigurationUpdate configurationUpdate = - configurationManager.getLatestResourceConfigurationUpdate(subject, resourceId); - resourceConfiguration = (configurationUpdate != null) ? configurationUpdate.getConfiguration() : null; - - if (resourceConfiguration != null) { - ConfigurationMaskingUtility.maskConfiguration(resourceConfiguration, resourceConfigurationDefinition); + @Override + protected void changeToRawTab() { + resourceConfiguration = translateToRaw(); +// initRawConfigDirectories(); + for (RawConfiguration raw : resourceConfiguration.getRawConfigurations()) { + RawConfigUIBean uiBean = findRawConfigUIBeanByPath(raw.getPath()); + uiBean.setRawConfiguration(raw); } - } - private void initRawConfigDirectories() { - if (isRawSupported() || isStructuredAndRawSupported()) { - initConfigDirectories(); - } - else { - rawConfigDirectories = Collections.EMPTY_LIST; - } + private Configuration translateToRaw() { + ConfigurationManagerLocal configurationMgr = LookupUtil.getConfigurationManager(); + return configurationMgr.translateResourceConfiguration(loggedInUser.getSubject(), resourceId, + resourceConfiguration, STRUCTURED_MODE); } - private void initConfigDirectories() { - Map<String, RawConfigDirectory> dirs = new TreeMap<String, RawConfigDirectory>(); - - for (RawConfiguration rawConfig : resourceConfiguration.getRawConfigurations()) { - String parentDirPath = getParentDir(rawConfig); - RawConfigDirectory dir = dirs.get(parentDirPath); + @Override + protected void changeToStructuredTab() { + resourceConfiguration = translateToStructured(); + } - if (dir == null) { - dir = new RawConfigDirectory(); - dir.setPath(parentDirPath); + private Configuration translateToStructured() { + ConfigurationManagerLocal configurationMgr = LookupUtil.getConfigurationManager(); + return configurationMgr.translateResourceConfiguration(loggedInUser.getSubject(), resourceId, + resourceConfiguration, RAW_MODE); + } + + @Observer("rawConfigUpdate") + public void rawConfigUpdated(RawConfigUIBean rawConfigUIBean) { + if (rawConfigUIBean.isModified()) { + // If the file is modified and not already in the cache, then the file was previously in an unmodified state + // so we want to increment the number of files modified and put the file in the cache to track its current + // state. + if (!modifiedFiles.contains(rawConfigUIBean.getPath())) { + modifiedFiles.add(rawConfigUIBean.getPath()); + ++numberOfFilesModified; } - - dir.addRawConfig(rawConfig); - dirs.put(parentDirPath, dir); - } - - rawConfigDirectories = dirs.values(); - - RawConfigDirectory selectedDir = null; - for (RawConfigDirectory dir : rawConfigDirectories) { - selectedDir = dir; - break; + // There is kind of an implicit else block to do nothing. If the file is modified and already in the cache, + // then that means we have already incremented the number of files modified, so we do not need to + // increment again. } - selectedRawUIBean = selectedDir.getRawConfigUIBeans().get(0); - } - - private String getParentDir(RawConfiguration rawConfig) { - File file = new File(rawConfig.getPath()); - return file.getParentFile().getAbsolutePath(); - } - - public boolean isReadOnly() { - return readOnly; - } - - public void setReadOnly(boolean readOnly) { - this.readOnly = readOnly; - } - - public boolean isRawSupported() { - return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.RAW; - } - - public boolean isStructuredSupported() { - return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED; - } - - public boolean isStructuredAndRawSupported() { - return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED_AND_RAW; - } - - public String getSelectedTab() { - if (mode == STRUCTURED_MODE) { - return "structuredTab"; + else if (modifiedFiles.contains(rawConfigUIBean.getPath())) { + // We fall into this block if the file is not modified and if the cache contains the file, which means it + // was previously in a modified state; therefore, we remove it from the cache, and decrement the number of + // files modified. + modifiedFiles.remove(rawConfigUIBean.getPath()); + --numberOfFilesModified; } - return "rawTab"; } - public void setSelectedTab(String tab) { - if (tab.equals("structuredTab")) { - mode = STRUCTURED_MODE; - } - else { - mode = RAW_MODE; + public boolean isDisplayChangedFilesLabel() { + if (isStructuredMode()) { + return false; } - } - public void changeTabs(ValueChangeEvent event) { - if (event.getNewValue().equals("rawTab")) { -// switchToRaw(); - mode = RAW_MODE; - } - else if (event.getNewValue().equals("structuredTab")) { -// switchToStructured(); - mode = STRUCTURED_MODE; + if (isRawSupported()) { + return true; } - } - public void edit() { - originalResourceConfiguration = resourceConfiguration.deepCopy(true); - } - - public void select(String path) { - selectedRawUIBean = findRawConfigUIBeanByPath(path); + return isRawMode(); } - private RawConfigUIBean findRawConfigUIBeanByPath(String path) { - for (RawConfigDirectory dir : rawConfigDirectories) { - for (RawConfigUIBean bean : dir.getRawConfigUIBeans()) { - if (bean.getPath().equals(path)) { - return bean; - } - } + public String getModifiedFilesMsg() { + if (!isDisplayChangedFilesLabel() || numberOfFilesModified == 0) { + return ""; } - return null; - } - - public boolean isUpdateInProgress() { - ConfigurationManagerLocal configurationMgr = LookupUtil.getConfigurationManager(); - return configurationMgr.isResourceConfigurationUpdateInProgress(loggedInUser.getSubject(), resourceId); - } - - public String download() { - try { - File file = new File(selectedRawUIBean.getFileName()); - - HttpServletResponse response = FacesContextUtility.getResponse(); - response.setHeader("Content-Disposition", "attachment;filename=" + file.getName()); - OutputStream ostream = response.getOutputStream(); - ostream.write(selectedRawUIBean.getContents().getBytes()); - ostream.flush(); - ostream.close(); - - FacesContextUtility.getFacesContext().responseComplete(); - return null; + if (numberOfFilesModified == 1) { + return "1 file changed in this configuration"; } - catch (IOException e) { -// log.error("Failed to complete download request for " + getCurrentPath(), e); - throw new RuntimeException(e); - } - } + return numberOfFilesModified + " files changed in this configuration"; + } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java new file mode 100644 index 0000000..3bb7c6c --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java @@ -0,0 +1,258 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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.enterprise.gui.configuration.resource; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.*; +import org.jboss.seam.annotations.web.RequestParameter; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.RawConfiguration; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.ConfigurationFormat; +import org.rhq.core.gui.configuration.ConfigurationMaskingUtility; +import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.enterprise.gui.legacy.WebUser; +import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +import javax.faces.event.ValueChangeEvent; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.util.*; + +@Name("configurationViewer") +(a)Scope(ScopeType.PAGE) +public class ResourceConfigurationViewer { + + public static final boolean STRUCTURED_MODE = true; + public static final boolean RAW_MODE = false; + + private boolean mode = STRUCTURED_MODE; + + @In("webUser") + protected WebUser loggedInUser; + + @Out + protected Configuration resourceConfiguration; + + @Out + private ConfigurationDefinition resourceConfigurationDefinition; + + @Out + private Collection<RawConfigDirectory> rawConfigDirectories; + + @Out(required = false) + private RawConfigUIBean selectedRawUIBean; + + @RequestParameter("id") + protected int resourceId; + + /** + * This method "bootstraps" the viewer/editor and the model objects used in the view. Specifically, the resource + * configuration and the corresponding configuration definition are loaded from the database and are outjected for + * use in the view. + */ + @Create + public void initialize() { + loadResourceConfigurationDefinition(); + loadResourceConfiguration(); + initRawConfigDirectories(); + + doInitialization(); + } + + protected void doInitialization() { + } + + private void loadResourceConfigurationDefinition() { + int resourceTypeId = EnterpriseFacesContextUtility.getResource().getResourceType().getId(); + + ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + resourceConfigurationDefinition = configurationManager.getResourceConfigurationDefinitionForResourceType( + loggedInUser.getSubject(), resourceTypeId); + } + + private void loadResourceConfiguration() { + Subject subject = loggedInUser.getSubject(); + + ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + + AbstractResourceConfigurationUpdate configurationUpdate = + configurationManager.getLatestResourceConfigurationUpdate(subject, resourceId); + resourceConfiguration = (configurationUpdate != null) ? configurationUpdate.getConfiguration() : null; + + if (resourceConfiguration != null) { + ConfigurationMaskingUtility.maskConfiguration(resourceConfiguration, resourceConfigurationDefinition); + } + + } + + protected void initRawConfigDirectories() { + if (isRawSupported() || isStructuredAndRawSupported()) { + initConfigDirectories(); + } + else { + rawConfigDirectories = Collections.EMPTY_LIST; + } + } + + private void initConfigDirectories() { + Map<String, RawConfigDirectory> dirs = new TreeMap<String, RawConfigDirectory>(); + + for (RawConfiguration rawConfig : resourceConfiguration.getRawConfigurations()) { + String parentDirPath = getParentDir(rawConfig); + RawConfigDirectory dir = dirs.get(parentDirPath); + + if (dir == null) { + dir = new RawConfigDirectory(); + dir.setPath(parentDirPath); + } + + dir.addRawConfig(rawConfig); + dirs.put(parentDirPath, dir); + } + + rawConfigDirectories = dirs.values(); + + RawConfigDirectory selectedDir = null; + for (RawConfigDirectory dir : rawConfigDirectories) { + selectedDir = dir; + break; + } + selectedRawUIBean = selectedDir.getRawConfigUIBeans().get(0); + } + + private String getParentDir(RawConfiguration rawConfig) { + File file = new File(rawConfig.getPath()); + return file.getParentFile().getAbsolutePath(); + } + + /** @return <code>true</code> if the resource configuration supports raw only, <code>false</code> otherwise */ + public boolean isRawSupported() { + return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.RAW; + } + + /** @return <code>true</code> if the resource configuration supports structured only, <code>false</code> otherwise */ + public boolean isStructuredSupported() { + return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED; + } + + public boolean isStructuredMode() { + return mode == STRUCTURED_MODE; + } + + public boolean isRawMode() { + return mode == RAW_MODE; + } + + /** + * @return <code>true</code> if the resource configuration supports structured and raw, <code>false</code> otherwise + */ + public boolean isStructuredAndRawSupported() { + return resourceConfigurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED_AND_RAW; + } + + /** @return The currently selected tab, structured (i.e., Basic Mode) or raw (i.e., Advanced Mode). */ + public String getSelectedTab() { + if (mode == STRUCTURED_MODE) { + return "structuredTab"; + } + return "rawTab"; + } + + public void setSelectedTab(String tab) { + if (tab.equals("structuredTab")) { + mode = STRUCTURED_MODE; + } + else { + mode = RAW_MODE; + } + } + + public void changeTabs(ValueChangeEvent event) { + if (event.getNewValue().equals("rawTab")) { + mode = RAW_MODE; + changeToRawTab(); + } + else if (event.getNewValue().equals("structuredTab")) { + mode = STRUCTURED_MODE; + changeToStructuredTab(); + } + } + + protected void changeToRawTab() { + } + + protected void changeToStructuredTab() { + } + + + public void select(String path) { + selectedRawUIBean = findRawConfigUIBeanByPath(path); + } + + protected RawConfigUIBean findRawConfigUIBeanByPath(String path) { + for (RawConfigDirectory dir : rawConfigDirectories) { + for (RawConfigUIBean bean : dir.getRawConfigUIBeans()) { + if (bean.getPath().equals(path)) { + return bean; + } + } + } + return null; + } + + public boolean isUpdateInProgress() { + ConfigurationManagerLocal configurationMgr = LookupUtil.getConfigurationManager(); + return configurationMgr.isResourceConfigurationUpdateInProgress(loggedInUser.getSubject(), resourceId); + } + + public String download() { + try { + File file = new File(selectedRawUIBean.getFileName()); + + HttpServletResponse response = FacesContextUtility.getResponse(); + response.setHeader("Content-Disposition", "attachment;filename=" + file.getName()); + OutputStream ostream = response.getOutputStream(); + ostream.write(selectedRawUIBean.getContents().getBytes()); + ostream.flush(); + ostream.close(); + + FacesContextUtility.getFacesContext().responseComplete(); + + return null; + } + catch (IOException e) { +// log.error("Failed to complete download request for " + getCurrentPath(), e); + throw new RuntimeException(e); + } + } + +} diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml index ba713eb..0b9ab22 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml @@ -57,9 +57,9 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup id="upperCommitPanel" style="text-align:right"> <h:outputText id="changedFilesLabel" - rendered="#{ExistingResourceConfigurationUIBean.displayChangedFilesLabel}" + rendered="#{configurationEditor.displayChangedFilesLabel}" style="padding-right:10px" - value="#{ExistingResourceConfigurationUIBean.modifiedFilesMsg}"/> + value="#{configurationEditor.modifiedFilesMsg}"/> <h:commandButton value="Commit" action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" title="Click to Save Changes" @@ -158,8 +158,8 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <h:outputText value="#{ExistingResourceConfigurationUIBean.modifiedFilesMsg}" - rendered="#{ExistingResourceConfigurationUIBean.rawMode}" + <h:outputText value="#{configurationEditor.modifiedFilesMsg}" + rendered="#{configurationEditor .rawMode}" style="padding-right:10px"/> <h:commandButton value="Commit" action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" @@ -197,22 +197,22 @@ THIS TEXT WILL BE REMOVED. <rich:tabPanel id="configTabPanel" selectedTab="#{configurationEditor.selectedTab}" switchType="ajax" - valueChangeListener="#{ExistingResourceConfigurationUIBean.changeTabs}"> + valueChangeListener="#{configurationEditor.changeTabs}"> <rich:tab id="structuredTab" label="Basic Mode" reRender="fileUpload,upperCommitPanel" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> - <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" - nullConfigurationDefinitionMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationMessage}" + <onc:config configurationDefinition="#{resourceConfigurationDefinition}" + configuration="#{resourceConfiguration}" + nullConfigurationDefinitionMessage="#{msg['resource.configuration.definition.null']}" + nullConfigurationMessage="#{msg['resource.configuration.null']}" prevalidate="true"/> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell" - rendered="#{ExistingResourceConfigurationUIBean.configuration != null}"> + rendered="#{resourceConfiguration != null}"> <h:commandButton value="SAVE" action="#{ExistingResourceConfigurationUIBean.updateConfiguration}" title="Click to Save Changes" @@ -227,7 +227,7 @@ THIS TEXT WILL BE REMOVED. </rich:tab> <rich:tab id="rawTab" label="Advanced Mode" - reRender="fileUpload,upperCommitPanel,lowerCommitPanel" + reRender="fileUpload,fileMenuPanel,upperCommitPanel,lowerCommitPanel" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> <h:panelGrid columns="2" @@ -251,10 +251,9 @@ THIS TEXT WILL BE REMOVED. <c:forEach items="#{rawConfigDir.rawConfigUIBeans}" var="rawConfigUIBean"> <rich:panelMenuItem label="#{rawConfigUIBean.fileName}" icon="#{rawConfigUIBean.icon}" - binding="#{rawConfigUIBean.panelMenuItem}" onclick="cursor_wait();" oncomplete="cursor_clear();" - action="#{ExistingResourceConfigurationUIBean.select(rawConfigUIBean.path)}" + action="#{configurationEditor.select(rawConfigUIBean.path)}" limitToList="true" reRender="fileContents,selectedFileHeader,modalEditor,fileMenu"> <h:panelGroup> @@ -302,13 +301,12 @@ THIS TEXT WILL BE REMOVED. <rich:panel id="fileContentsPanel" style="margin-left:1px; border: none;"> <h:inputTextarea id="fileContents" style="width:100%" - value="#{ExistingResourceConfigurationUIBean.currentContents}" + value="#{selectedRawUIBean.contents}" readonly="false"> <a4j:support event="onkeyup" ignoreDupeResponses="true" - reRender="fileMenu,upperCommitPanel,lowerCommitPanel" - requestDelay="1000" - action="#{ExistingResourceConfigurationUIBean.editCurrent}"/> + reRender="fileMenuPanel,upperCommitPanel,lowerCommitPanel" + requestDelay="1000"/> </h:inputTextarea> </rich:panel> </h:panelGrid> @@ -316,8 +314,8 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup id="lowerCommitPanel" style="text-align:right"> - <h:outputText value="#{ExistingResourceConfigurationUIBean.modifiedFilesMsg}" - rendered="#{ExistingResourceConfigurationUIBean.rawMode}" + <h:outputText value="#{configurationEditor.modifiedFilesMsg}" + rendered="#{configurationEditor.displayChangedFilesLabel}" style="padding-right:10px"/> <h:commandButton value="Commit" action="#{ExistingResourceConfigurationUIBean.updateRawConfiguration}" diff --git a/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy b/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy index 6d7b3f5..ed97f48 100644 --- a/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy +++ b/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy @@ -50,7 +50,7 @@ class RawServer implements ResourceComponent, ResourceConfigurationFacet { rawConfig.createNewFile() rawConfig.withWriter { writer -> - properties.each { key, value -> writer.writeLine("${key}=${value}") } + properties.each { key, value -> writer.writeLine("${key} = ${value}") } } } diff --git a/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy b/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy index f1a0455..a20901e 100644 --- a/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy +++ b/modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy @@ -64,7 +64,7 @@ class StructuredAndRawServer implements ResourceComponent, ResourceConfiguration def addProperties(File rawConfig, Map properties) { rawConfig.createNewFile() rawConfig.withWriter {writer -> - properties.each {key, value -> writer.writeLine("${key}=${value}") } + properties.each {key, value -> writer.writeLine("${key} = ${value}") } } } commit e610b55bd0c397b676766c6c31fa5bd3b20ad259 Author: John Sanda <john(a)localhost.localdomain> Date: Mon Feb 1 16:19:24 2010 -0500 Updating lower edit button on view.xhtml so that you are sent to the same tab on edit.xhtml. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index 4ad0606..9e5b695 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -4,17 +4,21 @@ * 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. + * 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 for more details. + * 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 - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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.enterprise.gui.configuration.resource; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml index 59645e9..3b05ebb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml @@ -48,18 +48,10 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="2" style="width:100%"> <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <s:button id="upperEditButton" value="Edit" view="edit.xhtml" styleClass="buttonmed"> <f:param name="id" value="#{ResourceUIBean.id}"/> <f:param name="tab" value="#{configurationViewer.selectedTab}"/> </s:button> - - <ui:remove> - <h:commandButton value="Edit" - action="#{ExistingResourceConfigurationUIBean.editRawConfiguration}" - title="Advanced Mode Edit of Raw Configuration Files" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure and !configurationViewer.updateInProgress}"/> - </ui:remove> </h:panelGroup> </h:panelGrid> </h:panelGrid> @@ -131,10 +123,10 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <h:commandButton value="Edit" - action="#{ExistingResourceConfigurationUIBean.editRawConfiguration}" - title="Advanced Mode Edit of Raw Configuration Files" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure and !configurationViewer.updateInProgress}"/> + <s:button id="lowerEditRawButton" value="Edit" view="edit.xhtml" styleClass="buttonmed"> + <f:param name="id" value="#{ResourceUIBean.id}"/> + <f:param name="tab" value="#{configurationViewer.selectedTab}"/> + </s:button> </h:panelGroup> </h:panelGrid> </rich:tab> @@ -158,10 +150,10 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <h:commandButton value="Edit" - action="#{ExistingResourceConfigurationUIBean.editConfiguration}" - title="Advanced Mode Edit of Raw Configuration Files" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure and !configurationViewer.updateInProgress}"/> + <s:button id="lowerEditStructuredButton" value="Edit" view="edit.xhtml" styleClass="buttonmed"> + <f:param name="id" value="#{ResourceUIBean.id}"/> + <f:param name="tab" value="#{configurationViewer.selectedTab}"/> + </s:button> </h:panelGroup> </h:panelGrid> </rich:tab> @@ -177,7 +169,7 @@ THIS TEXT WILL BE REMOVED. onlabelclick="cursor_wait();" oncomplete="cursor_clear();" limitToList="true" - reRender="upperEditButton,fileUpload,upperCommitPanel,lowerCommitPanel"> + reRender="upperEditButton,lowerEditStructuredButton,lowerEditRawButton,fileUpload,upperCommitPanel,lowerCommitPanel"> <h:outputText value=" #{messages.nopermissionedit}" rendered="#{!ResourceUIBean.permissions.configure}"/> @@ -191,10 +183,10 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <h:commandButton value="Edit" - action="#{ExistingResourceConfigurationUIBean.editConfiguration}" - title="Advanced Mode Edit of Raw Configuration Files" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure and !configurationViewer.updateInProgress}"/> + <s:button id="lowerEditStructuredButton" value="Edit" view="edit.xhtml" styleClass="buttonmed"> + <f:param name="id" value="#{ResourceUIBean.id}"/> + <f:param name="tab" value="#{configurationViewer.selectedTab}"/> + </s:button> </h:panelGroup> </h:panelGrid> </rich:tab> @@ -203,7 +195,7 @@ THIS TEXT WILL BE REMOVED. onlabelclick="cursor_wait();" oncomplete="cursor_clear();" limitToList="true" - reRender="upperEditButton,fileUpload,upperCommitPanel,lowerCommitPanel"> + reRender="upperEditButton,lowerEditStructuredButton,lowerEditRawButton,fileUpload,upperCommitPanel,lowerCommitPanel"> <h:outputText value=" #{messages.nopermissionedit}" rendered="#{!ResourceUIBean.permissions.configure}"/> @@ -264,10 +256,10 @@ THIS TEXT WILL BE REMOVED. <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> - <h:commandButton value="Edit" - action="#{ExistingResourceConfigurationUIBean.editRawConfiguration}" - title="Advanced Mode Edit of Raw Configuration Files" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure and !configurationViewer.updateInProgress}"/> + <s:button id="lowerEditRawButton" value="Edit" view="edit.xhtml" styleClass="buttonmed"> + <f:param name="id" value="#{ResourceUIBean.id}"/> + <f:param name="tab" value="#{configurationViewer.selectedTab}"/> + </s:button> </h:panelGroup> </h:panelGrid> </rich:tab>

1 0

[rhq] Branch 'raw-config' - 2 commits - .gitignore test-output/emailable-report.html test-output/index.html test-output/rhq test-output/testng.css test-output/testng-failed.xml test-output/testng-results.xml
by Adam Young 03 Feb '10

03 Feb '10

.gitignore | 2 test-output/emailable-report.html | 57 test-output/index.html | 9 test-output/rhq/classes.html | 68 - test-output/rhq/classes.properties | 1 test-output/rhq/classes.xml | 12 test-output/rhq/groups.html | 1 test-output/rhq/index.html | 6 test-output/rhq/main.html | 2 test-output/rhq/methods-alphabetical.html | 68 - test-output/rhq/methods-not-run.html | 2 test-output/rhq/methods.html | 68 - test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.html | 596 ---------- test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.properties | 1 test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.xml | 173 -- test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.html | 229 --- test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.properties | 1 test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.xml | 14 test-output/rhq/reporter-output.html | 1 test-output/rhq/testng-failed.xml | 15 test-output/rhq/testng.xml.html | 1 test-output/rhq/toc.html | 30 test-output/testng-failed.xml | 15 test-output/testng-results.xml | 76 - test-output/testng.css | 9 25 files changed, 2 insertions(+), 1455 deletions(-) New commits: commit ced3c1bea471a0f4285fde2cf4e715214cf19f4d Author: Adam Young <ayoung(a)redhat.com> Date: Wed Feb 3 09:48:54 2010 -0500 making sure we ignore test output . diff --git a/.gitignore b/.gitignore index 1d53abe..b10fd3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ target target/* +test-output +test-output/* eclipse-classes eclipse-classes/* logs commit 54ea8ca5d38e41919070276a904d198b416d7470 Author: Adam Young <ayoung(a)redhat.com> Date: Wed Feb 3 09:47:49 2010 -0500 removed test-output diff --git a/test-output/emailable-report.html b/test-output/emailable-report.html deleted file mode 100644 index 2fec89b..0000000 --- a/test-output/emailable-report.html +++ /dev/null @@ -1,57 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<title>TestNG: Unit Test</title> -<style type="text/css"> -table caption,table.info_table,table.param,table.passed,table.failed {margin-bottom:10px;border:1px solid #000099;border-collapse:collapse;empty-cells:show;} -table.info_table td,table.info_table th,table.param td,table.param th,table.passed td,table.passed th,table.failed td,table.failed th { -border:1px solid #000099;padding:.25em .5em .25em .5em -} -table.param th {vertical-align:bottom} -td.numi,th.numi,td.numi_attn { -text-align:right -} -tr.total td {font-weight:bold} -table caption { -text-align:center;font-weight:bold; -} -table.passed tr.stripe td,table tr.passedodd td {background-color: #00AA00;} -table.passed td,table tr.passedeven td {background-color: #33FF33;} -table.passed tr.stripe td,table tr.skippedodd td {background-color: #cccccc;} -table.passed td,table tr.skippedodd td {background-color: #dddddd;} -table.failed tr.stripe td,table tr.failedodd td,table.param td.numi_attn {background-color: #FF3333;} -table.failed td,table tr.failedeven td,table.param tr.stripe td.numi_attn {background-color: #DD0000;} -tr.stripe td,tr.stripe th {background-color: #E6EBF9;} -p.totop {font-size:85%;text-align:center;border-bottom:2px black solid} -div.shootout {padding:2em;border:3px #4854A8 solid} -</style> -</head> -<body> -<table cellspacing=0 cellpadding=0 class="param"> -<tr><th>Test</th><th class="numi">Methods<br/>Passed</th><th class="numi">Scenarios<br/>Passed</th><th class="numi"># skipped</th><th class="numi"># failed</th><th class="numi">Total<br/>Time</th><th class="numi">Included<br/>Groups</th><th class="numi">Excluded<br/>Groups</th></tr> -<tr><td style="text-align:left;padding-right:2em">classes</td><td class="numi">8</td><td class="numi">8</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.2 seconds</td><td class="numi"></td><td class="numi"></td></tr> -</table> -<a id="summary"></a> -<table cellspacing=0 cellpadding=0 class="passed"> -<tr><th>Class</th><th>Method</th><th># of<br/>Scenarios</th><th>Time<br/>(Msecs)</th></tr> -<tr><th colspan="4">classes — passed</th></tr> -<tr class="passedodd"><td rowspan="8">org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest<br>"classes"<td><a href="#m1"><b>factoryShouldInitializeLegacyConfigMgmtWithComponentService</b> </a></td><td class="numi">1</td><td class="numi">51</td></tr><tr class="passedodd"><td><a href="#m2"><b>factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</b> </a></td><td class="numi">1</td><td class="numi">4</td></tr><tr class="passedodd"><td><a href="#m3"><b>factoryShouldInitializeLoadStructuredAndRawWithComponentService</b> </a></td><td class="numi">1</td><td class="numi">2</td></tr><tr class="passedodd"><td><a href="#m4"><b>factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</b> </a></td><td class="numi">1</td><td class="numi">5</td></tr><tr class="passedodd"><td><a href="#m5"><b>factoryShouldInitializeRawConfigMgmtWithComponentService</b> </a></td><td class="numi">1</td><td class="numi">5</td></tr><tr class="passedodd"><td><a href="#m6"><b>factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</b> </a></td><td class="numi">1</td><td class="numi">16</td></tr><tr class="passedodd"><td><a href="#m7"><b>factoryShouldInitializeStructuredConfigMgmtWithComponentService</b> </a></td><td class="numi">1</td><td class="numi">14</td></tr><tr class="passedodd"><td><a href="#m8"><b>factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</b> </a></td><td class="numi">1</td><td class="numi">16</td></tr> -</table> -<h1>classes</h1> -<a id="m1"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeLegacyConfigMgmtWithComponentService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m2"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m3"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeLoadStructuredAndRawWithComponentService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m4"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m5"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeRawConfigMgmtWithComponentService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m6"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m7"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeStructuredConfigMgmtWithComponentService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -<a id="m8"></a><h2>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest:factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</h2> -<p class="totop"><a href="#summary">back to summary</a></p> -</body></html> diff --git a/test-output/index.html b/test-output/index.html deleted file mode 100644 index 87b37e4..0000000 --- a/test-output/index.html +++ /dev/null @@ -1,9 +0,0 @@ -<html> -<head><title>Test results</title><link href="./testng.css" rel="stylesheet" type="text/css" /> -<link href="./my-testng.css" rel="stylesheet" type="text/css" /> -</head><body> -<h2><p align='center'>Test results</p></h2> -<table border='1' width='100%' class='main-page'><tr><th>Suite</th><th>Passed</th><th>Failed</th><th>Skipped</th><th>testng.xml</th></tr> -<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>8</em></td><td><em>0</em></td><td><em>0</em></td><td> </td></tr> -<tr align='center' class='invocation-passed'><td><a href='rhq/index.html'>rhq</a></td> -<td>8</td><td>0</td><td>0</td><td><a href='rhq/testng.xml.html'>Link</a></td></tr></table></body></html> diff --git a/test-output/rhq/classes.html b/test-output/rhq/classes.html deleted file mode 100644 index f027d8a..0000000 --- a/test-output/rhq/classes.html +++ /dev/null @@ -1,68 +0,0 @@ -<table border='1'> -<tr> -<th>Class name</th> -<th>Method name</th> -<th>Groups</th> -</tr><tr> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td> </td><td> </td></tr> -<tr> -<td align='center' colspan='3'>@Test</td> -</tr> -<tr> -<td> </td> -<td>factoryShouldInitializeStructuredConfigMgmtWithComponentService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeRawConfigMgmtWithComponentService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeLoadStructuredAndRawWithComponentService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</td> -<td> </td></tr> -<tr> -<td> </td> -<td>factoryShouldInitializeLegacyConfigMgmtWithComponentService</td> -<td> </td></tr> -<tr> -<td align='center' colspan='3'>@BeforeClass</td> -</tr> -<tr> -<td align='center' colspan='3'>@BeforeMethod</td> -</tr> -<tr> -<td> </td> -<td>initContext</td> -<td> </td></tr> -<tr> -<td> </td> -<td>initMocks</td> -<td> </td></tr> -<tr> -<td> </td> -<td>setup</td> -<td> </td></tr> -<tr> -<td align='center' colspan='3'>@AfterMethod</td> -</tr> -<tr> -<td align='center' colspan='3'>@AfterClass</td> -</tr> -</table> diff --git a/test-output/rhq/classes.properties b/test-output/rhq/classes.properties deleted file mode 100644 index 1305823..0000000 --- a/test-output/rhq/classes.properties +++ /dev/null @@ -1 +0,0 @@ -[SuiteResult classes] \ No newline at end of file diff --git a/test-output/rhq/classes.xml b/test-output/rhq/classes.xml deleted file mode 100644 index 758938a..0000000 --- a/test-output/rhq/classes.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuite name="classes" failures="0" tests="8" time="0.212" errors="0"> - <properties/> - <testcase name="factoryShouldInitializeLegacyConfigMgmtWithComponentService" time="0.051" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService" time="0.004" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeLoadStructuredAndRawWithComponentService" time="0.002" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService" time="0.005" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeRawConfigMgmtWithComponentService" time="0.005" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService" time="0.016" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeStructuredConfigMgmtWithComponentService" time="0.014" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService" time="0.016" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> -</testsuite> diff --git a/test-output/rhq/groups.html b/test-output/rhq/groups.html deleted file mode 100644 index 199cb3f..0000000 --- a/test-output/rhq/groups.html +++ /dev/null @@ -1 +0,0 @@ -<h2>Groups used for this test run</h2> \ No newline at end of file diff --git a/test-output/rhq/index.html b/test-output/rhq/index.html deleted file mode 100644 index c168c9b..0000000 --- a/test-output/rhq/index.html +++ /dev/null @@ -1,6 +0,0 @@ -<html><head><title>Results for rhq</title></head> -<frameset cols="26%,74%"> -<frame src="toc.html" name="navFrame"> -<frame src="main.html" name="mainFrame"> -</frameset> -</html> diff --git a/test-output/rhq/main.html b/test-output/rhq/main.html deleted file mode 100644 index 2240bae..0000000 --- a/test-output/rhq/main.html +++ /dev/null @@ -1,2 +0,0 @@ -<html><head><title>Results for rhq</title></head> -<body>Select a result on the left-hand pane.</body></html> diff --git a/test-output/rhq/methods-alphabetical.html b/test-output/rhq/methods-alphabetical.html deleted file mode 100644 index 65038a1..0000000 --- a/test-output/rhq/methods-alphabetical.html +++ /dev/null @@ -1,68 +0,0 @@ -<h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>rhq</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/> -<table border="1"> -<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithComponentService()">factoryShouldInitializeLegacyConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>56</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>63</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService()">factoryShouldInitializeLoadStructuredAndRawWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>73</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService()">factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>83</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService()">factoryShouldInitializeRawConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>116</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>146</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService()">factoryShouldInitializeStructuredConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>175</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>160</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -</table> diff --git a/test-output/rhq/methods-not-run.html b/test-output/rhq/methods-not-run.html deleted file mode 100644 index 54b14cb..0000000 --- a/test-output/rhq/methods-not-run.html +++ /dev/null @@ -1,2 +0,0 @@ -<h2>Methods that were not run</h2><table> -</table> \ No newline at end of file diff --git a/test-output/rhq/methods.html b/test-output/rhq/methods.html deleted file mode 100644 index 9fe711c..0000000 --- a/test-output/rhq/methods.html +++ /dev/null @@ -1,68 +0,0 @@ -<h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>rhq</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/> -<table border="1"> -<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-160</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithComponentService()">factoryShouldInitializeLegacyConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-104</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-97</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService()">factoryShouldInitializeLoadStructuredAndRawWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-87</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService()">factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-77</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService()">factoryShouldInitializeRawConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-44</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>-14</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService()">factoryShouldInitializeStructuredConfigMgmtWithComponentService</td> - <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="b0ce8f"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.test.JMockTest.initContext()">>>initContext</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="e97fbd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementTest.initMocks()">>>initMocks</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.setup()">>>setup</td> -<td> </td> <td>main@564660841</td> <td></td> </tr> -<tr bgcolor="8a75cd"> <td>10/02/02 20:31:22</td> <td>15</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService()">factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</td> - <td>main@564660841</td> <td></td> </tr> -</table> diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.html b/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.html deleted file mode 100644 index 195d609..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.html +++ /dev/null @@ -1,596 +0,0 @@ -<html> -<head> -<title>TestNG: org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</title> -<link href="../testng.css" rel="stylesheet" type="text/css" /> -<link href="../my-testng.css" rel="stylesheet" type="text/css" /> - -<style type="text/css"> -.log { display: none;} -.stack-trace { display: none;} -</style> -<script type="text/javascript"> - -</script> - -</head> -<body> -<h2 align='center'>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</h2><table border='1' align="center"> -<tr> -<td>Tests passed/Failed/Skipped:</td><td>1/7/0</td> -</tr><tr> -<td>Started on:</td><td>Tue Feb 02 16:31:43 EST 2010</td> -</tr> -<tr><td>Total time:</td><td>189 seconds (189379 ms)</td> -</tr><tr> -<td>Included groups:</td><td></td> -</tr><tr> -<td>Excluded groups:</td><td></td> -</tr> -</table><p/> -<small><i>(Hover the method name to see the test class name)</i></small><p/> -<table width='100%' border='1' class='invocation-failed'> -<tr><td colspan='4' align='center'><b>FAILED TESTS</b></td></tr> -<tr><td><b>Test method</b></td> -<td><b>Instance</b></td> -<td width="10%"><b>Time (seconds)</b></td> -<td width="30%"><b>Exception</b></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService()'><b>factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>0</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:171) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace2020350594", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace2020350594'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:171) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService()'><b>factoryShouldInitializeLoadStructuredAndRawWithComponentService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>125</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService(ConfigManagementFactoryImplTest.java:281) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace917483082", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace917483082'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService(ConfigManagementFactoryImplTest.java:281) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService()'><b>factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>55</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:304) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace1619519236", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace1619519236'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:304) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService()'><b>factoryShouldInitializeRawConfigMgmtWithComponentService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>1</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:237) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace1685580695", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace1685580695'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:237) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService()'><b>factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>0</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:259) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace999186587", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace999186587'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:259) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService()'><b>factoryShouldInitializeStructuredConfigMgmtWithComponentService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>0</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:193) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace2120070574", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace2120070574'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:193) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService()'><b>factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>0</td> -<td><div><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:215) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace1727921240", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace1727921240'><pre>unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:215) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -</table><p> -<table width='100%' border='1' class='invocation-passed'> -<tr><td colspan='4' align='center'><b>PASSED TESTS</b></td></tr> -<tr><td><b>Test method</b></td> -<td><b>Instance</b></td> -<td width="10%"><b>Time (seconds)</b></td> -<td width="30%"><b>Exception</b></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithComponentService()'><b>factoryShouldInitializeLegacyConfigMgmtWithComponentService</b><br>Test class:org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest</td> -<td>org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest@7ed75415</td><td>4</td> -<td></td> -</tr> -</table><p> -</body> -</html> \ No newline at end of file diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.properties b/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.properties deleted file mode 100644 index 24d8a18..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.properties +++ /dev/null @@ -1 +0,0 @@ -[SuiteResult org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest] \ No newline at end of file diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.xml b/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.xml deleted file mode 100644 index 9731c48..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.xml +++ /dev/null @@ -1,173 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuite name="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest" failures="7" tests="8" time="189.379" errors="0"> - <properties/> - <testcase name="factoryShouldInitializeLegacyConfigMgmtWithComponentService" time="4.489" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/> - <testcase name="factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService" time="0.008" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:171) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeLoadStructuredAndRawWithComponentService" time="125.987" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithComponentService(ConfigManagementFactoryImplTest.java:281) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService" time="55.251" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:304) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeRawConfigMgmtWithComponentService" time="1.564" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:237) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService" time="0.692" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:259) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeStructuredConfigMgmtWithComponentService" time="0.495" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithComponentService(ConfigManagementFactoryImplTest.java:193) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> - <testcase name="factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService" time="0.544" classname="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <failure type="org.jmock.api.ExpectationError" message="unexpected invocation"> - <![CDATA[unexpected invocation: componentService.fetchResourceComponent(<-1>) -expectations: - allowed, never invoked: componentService.getComponent(<-1>, <interface org.rhq.core.pluginapi.inventory.ResourceComponent>, <READ>, <60000L>, <true>, <true>); returns <resourceComponent> - allowed, already invoked 1 time: componentService.getResourceType(<-1>); returns <ResourceType[id=0, category=null, name=null, plugin=null]> -what happened before this: - componentService.getResourceType(<-1>) - - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:56) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy5.fetchResourceComponent(Unknown Source) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.createStrategy(ConfigManagementFactoryImpl.java:78) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImpl.getStrategy(ConfigManagementFactoryImpl.java:50) - at org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest.factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService(ConfigManagementFactoryImplTest.java:215) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames]]> - </failure> - </testcase> -</testsuite> diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.html b/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.html deleted file mode 100644 index a03885a..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.html +++ /dev/null @@ -1,229 +0,0 @@ -<html> -<head> -<title>TestNG: org.rhq.core.pc.configuration.ConfigurationManagerTest</title> -<link href="../testng.css" rel="stylesheet" type="text/css" /> -<link href="../my-testng.css" rel="stylesheet" type="text/css" /> - -<style type="text/css"> -.log { display: none;} -.stack-trace { display: none;} -</style> -<script type="text/javascript"> - -</script> - -</head> -<body> -<h2 align='center'>org.rhq.core.pc.configuration.ConfigurationManagerTest</h2><table border='1' align="center"> -<tr> -<td>Tests passed/Failed/Skipped:</td><td>10/0/0</td> -</tr><tr> -<td>Started on:</td><td>Tue Feb 02 15:16:58 EST 2010</td> -</tr> -<tr><td>Total time:</td><td>0 seconds (539 ms)</td> -</tr><tr> -<td>Included groups:</td><td></td> -</tr><tr> -<td>Excluded groups:</td><td></td> -</tr> -</table><p/> -<small><i>(Hover the method name to see the test class name)</i></small><p/> -<table width='100%' border='1' class='invocation-passed'> -<tr><td colspan='4' align='center'><b>PASSED TESTS</b></td></tr> -<tr><td><b>Test method</b></td> -<td><b>Instance</b></td> -<td width="10%"><b>Time (seconds)</b></td> -<td width="30%"><b>Exception</b></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.catchExceptionThrownByFailedValidationOfRawConfigs()'><b>catchExceptionThrownByFailedValidationOfRawConfigs</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownIfConfigIsNull()'><b>exceptionShouldBeThrownIfConfigIsNull</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td><div><pre>org.rhq.core.clientapi.agent.PluginContainerException: Plugin Error: Resource Component for [null] Resource with id [-1]: returned a null Configuration. - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:264) - at org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownIfConfigIsNull(ConfigurationManagerTest.java:112) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace1170987530", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace1170987530'><pre>org.rhq.core.clientapi.agent.PluginContainerException: Plugin Error: Resource Component for [null] Resource with id [-1]: returned a null Configuration. - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:264) - at org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownIfConfigIsNull(ConfigurationManagerTest.java:112) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownWhenStrategyThrowsAnException()'><b>exceptionShouldBeThrownWhenStrategyThrowsAnException</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td><div><pre>org.rhq.core.clientapi.agent.PluginContainerException: Plugin Error: Resource Component for [null] Resource with id [-1]: An exception was thrown. - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:260) - at org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownWhenStrategyThrowsAnException(ConfigurationManagerTest.java:132) - at org.rhq.test.JMockTest.run(JMockTest.java:42) -Caused by: java.lang.RuntimeException - at org.jmock.lib.action.ThrowAction.invoke(ThrowAction.java:27) - at org.jmock.internal.InvocationExpectation.invoke(InvocationExpectation.java:114) - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:52) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy11.executeLoad(Unknown Source) - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:258) - ... 30 more -... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace1651716188", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> -<div class='stack-trace' id='stack-trace1651716188'><pre>org.rhq.core.clientapi.agent.PluginContainerException: Plugin Error: Resource Component for [null] Resource with id [-1]: An exception was thrown. - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:260) - at org.rhq.core.pc.configuration.ConfigurationManagerTest.exceptionShouldBeThrownWhenStrategyThrowsAnException(ConfigurationManagerTest.java:132) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:644) - at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:762) - at org.rhq.test.JMockTest.run(JMockTest.java:42) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:616) - at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:770) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:539) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:700) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1002) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:137) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:121) - at org.testng.TestRunner.runWorkers(TestRunner.java:909) - at org.testng.TestRunner.privateRun(TestRunner.java:618) - at org.testng.TestRunner.run(TestRunner.java:499) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:332) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:327) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:299) - at org.testng.SuiteRunner.run(SuiteRunner.java:204) - at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:915) - at org.testng.TestNG.runSuitesLocally(TestNG.java:879) - at org.testng.TestNG.run(TestNG.java:787) - at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) - at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) -Caused by: java.lang.RuntimeException - at org.jmock.lib.action.ThrowAction.invoke(ThrowAction.java:27) - at org.jmock.internal.InvocationExpectation.invoke(InvocationExpectation.java:114) - at org.jmock.internal.InvocationDispatcher.dispatch(InvocationDispatcher.java:52) - at org.jmock.Mockery.dispatch(Mockery.java:218) - at org.jmock.Mockery.access$000(Mockery.java:43) - at org.jmock.Mockery$MockObject.invoke(Mockery.java:258) - at org.jmock.internal.InvocationDiverter.invoke(InvocationDiverter.java:27) - at org.jmock.internal.FakeObjectMethods.invoke(FakeObjectMethods.java:38) - at org.jmock.lib.JavaReflectionImposteriser$1.invoke(JavaReflectionImposteriser.java:33) - at $Proxy11.executeLoad(Unknown Source) - at org.rhq.core.pc.configuration.ConfigurationManager.loadResourceConfiguration(ConfigurationManager.java:258) - ... 30 more -</pre></div></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.mergingRawsIntoStructuredShouldIgnoreNull()'><b>mergingRawsIntoStructuredShouldIgnoreNull</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.mergingRawsIntoStructuredShouldUpdateLatestStructuredConfig()'><b>mergingRawsIntoStructuredShouldUpdateLatestStructuredConfig</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.mergingStructuredIntoRawShouldDoNothingIfRawsAreNull()'><b>mergingStructuredIntoRawShouldDoNothingIfRawsAreNull</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.mergingStructuredIntoRawShouldIgnoreNulls()'><b>mergingStructuredIntoRawShouldIgnoreNulls</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.mergingStucturedIntoRawShouldUpdateLatestRawConfigs()'><b>mergingStucturedIntoRawShouldUpdateLatestRawConfigs</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.strategyShouldBeCalledToLoadConfig()'><b>strategyShouldBeCalledToLoadConfig</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -<tr> -<td title='org.rhq.core.pc.configuration.ConfigurationManagerTest.updatingConfigShouldSubmitRunnerToThreadPool()'><b>updatingConfigShouldSubmitRunnerToThreadPool</b><br>Test class:org.rhq.core.pc.configuration.ConfigurationManagerTest</td> -<td>org.rhq.core.pc.configuration.ConfigurationManagerTest@564ac216</td><td>0</td> -<td></td> -</tr> -</table><p> -</body> -</html> \ No newline at end of file diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.properties b/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.properties deleted file mode 100644 index 84fd129..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.properties +++ /dev/null @@ -1 +0,0 @@ -[SuiteResult org.rhq.core.pc.configuration.ConfigurationManagerTest] \ No newline at end of file diff --git a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.xml b/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.xml deleted file mode 100644 index a661050..0000000 --- a/test-output/rhq/org.rhq.core.pc.configuration.ConfigurationManagerTest.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuite name="org.rhq.core.pc.configuration.ConfigurationManagerTest" failures="0" tests="10" time="0.539" errors="0"> - <properties/> - <testcase name="catchExceptionThrownByFailedValidationOfRawConfigs" time="0.042" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="exceptionShouldBeThrownIfConfigIsNull" time="0.011" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="exceptionShouldBeThrownWhenStrategyThrowsAnException" time="0.008" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="mergingRawsIntoStructuredShouldIgnoreNull" time="0.093" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="mergingRawsIntoStructuredShouldUpdateLatestStructuredConfig" time="0.019" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="mergingStructuredIntoRawShouldDoNothingIfRawsAreNull" time="0.018" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="mergingStructuredIntoRawShouldIgnoreNulls" time="0.018" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="mergingStucturedIntoRawShouldUpdateLatestRawConfigs" time="0.023" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="strategyShouldBeCalledToLoadConfig" time="0.021" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> - <testcase name="updatingConfigShouldSubmitRunnerToThreadPool" time="0.09" classname="org.rhq.core.pc.configuration.ConfigurationManagerTest"/> -</testsuite> diff --git a/test-output/rhq/reporter-output.html b/test-output/rhq/reporter-output.html deleted file mode 100644 index 063bc2e..0000000 --- a/test-output/rhq/reporter-output.html +++ /dev/null @@ -1 +0,0 @@ -<h2>Reporter output</h2><table></table> \ No newline at end of file diff --git a/test-output/rhq/testng-failed.xml b/test-output/rhq/testng-failed.xml deleted file mode 100644 index a243e55..0000000 --- a/test-output/rhq/testng-failed.xml +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [rhq]" junit="false" annotations="JDK" data-provider-thread-count="10"> - <test name="classes(failed)" junit="false" annotations="JDK"> - <classes> - <class name="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <methods> - <include name="initContext"/> - <include name="initMocks"/> - <include name="setup"/> - <include name="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService"/> - </methods> - </class> - </classes> - </test> -</suite> diff --git a/test-output/rhq/testng.xml.html b/test-output/rhq/testng.xml.html deleted file mode 100644 index 62a0d97..0000000 --- a/test-output/rhq/testng.xml.html +++ /dev/null @@ -1 +0,0 @@ -<html><head><title>testng.xml for rhq</title></head><body><tt><!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><br/><suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="rhq" junit="false" annotations="JDK" data-provider-thread-count="10"><br/>  <test verbose="2" name="classes" junit="false" annotations="JDK"><br/>    <classes><br/>      <class name="org.rhq.core.pc.configuration.MockResourceConfigurationFacet"/><br/>      <class name="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"/><br/>    </classes><br/>  </test><br/></suite><br/></tt></body></html> \ No newline at end of file diff --git a/test-output/rhq/toc.html b/test-output/rhq/toc.html deleted file mode 100644 index 6328f53..0000000 --- a/test-output/rhq/toc.html +++ /dev/null @@ -1,30 +0,0 @@ -<html> -<head> -<title>Results for rhq</title> -<link href="../testng.css" rel="stylesheet" type="text/css" /> -<link href="../my-testng.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<h3><p align="center">Results for<br/><em>rhq</em></p></h3> -<table border='1' width='100%'> -<tr valign='top'> -<td>1 test</td> -<td><a target='mainFrame' href='classes.html'>1 class</a></td> -<td>8 methods:<br/> -  <a target='mainFrame' href='methods.html'>chronological</a><br/> -  <a target='mainFrame' href='methods-alphabetical.html'>alphabetical</a><br/> -  <a target='mainFrame' href='methods-not-run.html'>not run (0)</a></td> -</tr> -<tr> -<td><a target='mainFrame' href='groups.html'>0 group</a></td> -<td><a target='mainFrame' href='reporter-output.html'>reporter output</a></td> -<td><a target='mainFrame' href='testng.xml.html'>testng.xml</a></td> -</tr></table> -<table width='100%' class='test-passed'> -<tr><td> -<table style='width: 100%'><tr><td valign='top'>classes (8/0/0)</td><td valign='top' align='right'> - <a href='classes.html' target='mainFrame'>Results</a> -</td></tr></table> -</td></tr><p/> -</table> -</body></html> \ No newline at end of file diff --git a/test-output/testng-failed.xml b/test-output/testng-failed.xml deleted file mode 100644 index a243e55..0000000 --- a/test-output/testng-failed.xml +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [rhq]" junit="false" annotations="JDK" data-provider-thread-count="10"> - <test name="classes(failed)" junit="false" annotations="JDK"> - <classes> - <class name="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <methods> - <include name="initContext"/> - <include name="initMocks"/> - <include name="setup"/> - <include name="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService"/> - </methods> - </class> - </classes> - </test> -</suite> diff --git a/test-output/testng-results.xml b/test-output/testng-results.xml deleted file mode 100644 index 4faf1c2..0000000 --- a/test-output/testng-results.xml +++ /dev/null @@ -1,76 +0,0 @@ -<testng-results> - <reporter-output> - </reporter-output> - <suite name="rhq"> - <groups> - </groups> - <test name="classes"> - <class name="org.rhq.core.pc.configuration.ConfigManagementFactoryImplTest"> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="9" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="11" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="1" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeLegacyConfigMgmtWithComponentService()" name="factoryShouldInitializeLegacyConfigMgmtWithComponentService" duration-ms="51" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="1" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService()" name="factoryShouldInitializeLegacyConfigMgmtWithConfigurationUtilityService" duration-ms="4" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="1" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeLoadStructuredAndRawWithComponentService()" name="factoryShouldInitializeLoadStructuredAndRawWithComponentService" duration-ms="2" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService()" name="factoryShouldInitializeLoadStructuredAndRawWithConfigurationUtilityService" duration-ms="5" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="1" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeRawConfigMgmtWithComponentService()" name="factoryShouldInitializeRawConfigMgmtWithComponentService" duration-ms="5" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="1" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService()" name="factoryShouldInitializeRawConfigMgmtWithConfigurationUtilityService" duration-ms="16" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeStructuredConfigMgmtWithComponentService()" name="factoryShouldInitializeStructuredConfigMgmtWithComponentService" duration-ms="14" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initContext()" name="initContext" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="initMocks()" name="initMocks" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService()" name="factoryShouldInitializeStructuredConfigMgmtWithConfigurationUtilityService" duration-ms="16" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - <test-method status="PASS" signature="setup()" name="setup" is-config="true" duration-ms="0" started-at="2010-02-02T20:31:22Z" finished-at="2010-02-02T20:31:22Z"> - </test-method> - </class> - </test> - </suite> -</testng-results> diff --git a/test-output/testng.css b/test-output/testng.css deleted file mode 100644 index 3904800..0000000 --- a/test-output/testng.css +++ /dev/null @@ -1,9 +0,0 @@ -.invocation-failed, .test-failed { background-color: #DD0000; } -.invocation-percent, .test-percent { background-color: #006600; } -.invocation-passed, .test-passed { background-color: #00AA00; } -.invocation-skipped, .test-skipped { background-color: #CCCC00; } - -.main-page { - font-size: x-large; -} -

1 0

[rhq] Branch 'gwt' - 14 commits - .classpath modules/core modules/enterprise modules/plugins .settings/org.eclipse.jdt.ui.prefs
by Joseph Marques 03 Feb '10

03 Feb '10

.classpath | 2 .settings/org.eclipse.jdt.ui.prefs | 4 modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java | 4 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115 ++++++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 85 ++++--- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 93 -------- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 14 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 90 +++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java | 71 ------ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73 ++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 15 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 7 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java | 8 modules/plugins/pom.xml | 3 17 files changed, 555 insertions(+), 210 deletions(-) New commits: commit 7c731de6c22d07df80a7cd3d8ff146e253c1d61a Merge: e5b480b... e01ac13... Author: Joseph Marques <joseph(a)redhat.com> Date: Wed Feb 3 09:37:16 2010 -0500 Merge branch 'master' into gwt commit e01ac1302020282dfa2f0583c30ff859089143ea Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 02:56:02 2010 -0500 refactor the jline integration to fix problems and enhance it. this commit will allow the user to select the implementation to use; you can now use the command line option --console (-e) to say if you want the console input to be read by "java" (pure Java implementation), "sigar" (this was the original native console way we had before) or "jline" (which is the new native console way). This allows a user to select a non-native way to read input in case they are running on a platform that doesn't support the native library (jline's native lib or sigar's native lib) or in case the native library has a bug and is causing the agent to crash. If you use "sigar", and you disable the native system API (native --disable), this will cause the console to fallback to the "java" console impl. If user is using "jline", there is no fallback to - if jline is giving problems, you must exit the agent, and specify a --console argument to override the console to use. The default is "jline". diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java index dc6644b..4f00ab1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -28,24 +28,32 @@ import java.io.IOException; */ public interface AgentInputReader { /** + * Indicates if the input is coming from a console (i.e. keyboard) or if its coming from + * a file. + * + * @return <code>true</code> if console is the source of the input; <code>false</code> if file is the source + */ + boolean isConsole(); + + /** * Reads a line from the input console. * * @return the line * @throws IOException */ String readLine() throws IOException; - + /** - * Reads a line from the input console, echoing out the 'mask' character as opposed to the character - * typed by the user. If the console implementation does not support mask echoes, either the - * user-entered character is masked or some other masking is performed in an implementation specific way. + * Read a line of input, but do not echo back to the user what is being typed. This is used mainly when asking for + * things like passwords. + * If the console implementation does not support no-echo input, the input will be + * output as the user typed it. * - * @param mask character to echo back to the user when the user types in the line. * @return the line typed by the user * @throws IOException */ - String readLine(char mask) throws IOException; - + String readLineNoEcho() throws IOException; + /** * Close the reader. * @throws IOException diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java index e3ebe4c..71f0e4f 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -18,19 +18,98 @@ */ package org.rhq.enterprise.agent; +import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; +import mazz.i18n.Logger; + +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + /** * Creates implementations of the input reader depending on the need for a native console library. * * @author John Mazzitelli */ public class AgentInputReaderFactory { - public static AgentInputReader create() throws IOException { - return new JlineAgentInputReader(); + private static final Logger LOG = AgentI18NFactory.getLogger(AgentInputReaderFactory.class); + + public static enum ConsoleType { + java, sigar, jline + } + + private static ConsoleType consoleType = ConsoleType.jline; + + public static AgentInputReader create(AgentMain agent) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(); + break; + case sigar: + input = new SigarAgentInputReader(agent); + break; + case jline: + input = new JLineAgentInputReader(agent); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(); + } + + return input; } - public static AgentInputReader create(FileInputStream fis) throws IOException { - return new JlineAgentInputReader(fis); + + public static AgentInputReader create(AgentMain agent, File file) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(new FileReader(file)); + break; + case sigar: + input = new SigarAgentInputReader(agent, new FileReader(file)); + break; + case jline: + input = new JLineAgentInputReader(agent, new FileInputStream(file)); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(new FileReader(file)); + } + + return input; + } + + public static ConsoleType getConsoleType() { + return consoleType; + } + + public static void setConsoleType(ConsoleType type) { + consoleType = type; + } + + public static void setConsoleType(String typeStr) { + try { + setConsoleType(ConsoleType.valueOf(typeStr)); + } catch (Exception e) { + throw new IllegalArgumentException(LOG.getMsgString( + AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_BAD_TYPE, typeStr)); + } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index aba4eb5..2baf5f5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -89,7 +89,6 @@ import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; import org.rhq.core.util.exception.ThrowableUtil; @@ -152,7 +151,6 @@ import org.rhq.enterprise.communications.command.server.CommandListener; import org.rhq.enterprise.communications.command.server.IncomingCommandTrace; import org.rhq.enterprise.communications.util.CommandTraceUtil; import org.rhq.enterprise.communications.util.SecurityUtil; -import org.rhq.enterprise.communications.util.prefs.PromptInput; /** * The main class of the agent runtime container. @@ -387,12 +385,13 @@ public class AgentMain { if (agent.m_forcedSetup || (!agent.m_daemonMode && !agent.m_configuration.isAgentConfigurationSetup())) { SetupPromptCommand setup_cmd = new SetupPromptCommand(); + AgentPromptInfo in = new AgentPromptInfo(agent); + AgentPrintWriter out = agent.getOut(); + Preferences prefs = agent.m_configuration.getPreferences(); if (agent.m_advancedSetup) { - setup_cmd.performAdvancedSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), - agent.getOut()); + setup_cmd.performAdvancedSetup(prefs, in, out); } else { - setup_cmd.performBasicSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), agent - .getOut()); + setup_cmd.performBasicSetup(prefs, in, out); } } @@ -459,7 +458,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = AgentInputReaderFactory.create(); + m_input = null; m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -477,6 +476,9 @@ public class AgentMain { m_commandLineArgs = args; processArguments(m_commandLineArgs); + if (m_input == null) { + m_input = AgentInputReaderFactory.create(this); + } m_promptCommands = new HashMap<String, Class<? extends AgentPromptCommand>>(); setupPromptCommandsMap(m_promptCommands); @@ -805,32 +807,6 @@ public class AgentMain { } /** - * In some cases, we want to read console input in a native way (that is, using the native system to read the - * keyboard input). This is mainly useful when you want to read in prompt answers which include passwords and you do - * not want to echo what the user typed. - * - * @return object that can be used to read input with the typed data being echoed or not - */ - public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); - } - - /** * Returns the object that can be used to obtain I18N messages from the agent's resource bundle in the user's * locale. * @@ -1097,10 +1073,10 @@ public class AgentMain { // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = AgentInputReaderFactory.create(); + m_input = AgentInputReaderFactory.create(this); } catch (IOException e1) { m_input = null; - } + } m_stdinInput = true; input_string = ""; } else { @@ -2691,12 +2667,13 @@ public class AgentMain { * @throws HelpException if help was requested and the agent should not be created */ private void processArguments(String[] args) throws Exception { - String sopts = "-:hdlasntuD:i:o:c:p:"; + String sopts = "-:hdlasntuD:i:o:c:p:e:"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'), new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), new LongOpt("config", LongOpt.REQUIRED_ARGUMENT, null, 'c'), new LongOpt("pref", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), @@ -2789,6 +2766,11 @@ public class AgentMain { break; } + case 'e': { + AgentInputReaderFactory.setConsoleType(getopt.getOptarg()); + break; + } + case 'd': { m_daemonMode = true; break; @@ -2798,7 +2780,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = AgentInputReaderFactory.create(new FileInputStream(script)); + m_input = AgentInputReaderFactory.create(this, script); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java deleted file mode 100644 index 287421d..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note - * that if the native libraries are not available or have been disabled, this will effectively fallback to using the - * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} - * will do the same as {@link #readLine()}). - * - * @author John Mazzitelli - */ -public class AgentNativePromptInfo implements PromptInput { - private final SystemInfo systemInfo; - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the system info used to obtain the console input - * natively. The agent is provided so it can give us a fallback stream where input can be read in case either <code> - * sysinfo</code> is <code>null</code> or it is not a native implementation (as will be the case if the platform - * where this object is running does not have native libraries for it). - * - * @param sysinfo the object where native console input can be read (may be <code>null</code>) - * @param agent the agent that will be doing the prompting and will provide us with a fallback input stream if - * <code>sysinfo</code> is <code>null</code> or not a native implementation - */ - public AgentNativePromptInfo(SystemInfo sysinfo, AgentMain agent) { - this.systemInfo = sysinfo; - this.agent = agent; - } - - public String readLine() throws IOException { - String input; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - input = systemInfo.readLineFromConsole(false); - } - - return input; - } - - public String readLineNoEcho() throws IOException { - String input = null; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - while (true) { - // get the answer the first time - input = systemInfo.readLineFromConsole(true); - - // get the answer a second time - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - String confirmation = systemInfo.readLineFromConsole(true); - systemInfo.writeLineToConsole("\n"); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - } - } - - return input; - } -} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java new file mode 100644 index 0000000..9984626 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note + * that if the native libraries are not available or have been disabled, this will effectively fallback to using the + * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} + * will do the same as {@link #readLine()}). + * + * @author John Mazzitelli + */ +public class AgentPromptInfo implements PromptInput { + + private final AgentMain agent; + + public AgentPromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLine(); + } else { + throw new IOException("Agent not accepting input"); + } + } + + public String readLineNoEcho() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLineNoEcho(); + } else { + throw new IOException("Agent not accepting input"); + } + } +} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java index 4d691c2..70e8e84 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java @@ -174,7 +174,19 @@ public class AgentUpdateThread extends Thread { if (results.getError() != null) { throw results.getError(); } - tryAgain = false; + + // update has started! if this agent is running in non-daemon mode, kill + // the input stream so the input thread knows to shutdown now + try { + AgentInputReader in = this.agent.getIn(); + if (in != null) { + System.in.close(); // we must ensure we close this directly! + in.close(); + } + } catch (Throwable t) { + } finally { + tryAgain = false; + } } catch (Throwable t) { showErrorMessage(AgentI18NResourceKeys.UPDATE_THREAD_EXCEPTION, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java new file mode 100644 index 0000000..15a3a89 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java @@ -0,0 +1,90 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +import jline.ConsoleReader; + +public class JLineAgentInputReader implements AgentInputReader { + + private final ConsoleReader jline; + private final AgentMain agent; + private final boolean consoleInput; + + public JLineAgentInputReader(AgentMain agent) throws IOException { + this.jline = new ConsoleReader(); + this.agent = agent; + this.consoleInput = true; + } + + public JLineAgentInputReader(AgentMain agent, FileInputStream fis) throws IOException { + this.jline = new ConsoleReader(fis, agent.getOut()); + this.agent = agent; + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.jline.readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time - the '*' is echoed back to the user + input = jline.readLine(Character.valueOf('*')); + + if (!isConsole()) { + break; // not reading input from a console, so we don't ask for confirmation + } + + // get the answer a second time + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + this.agent.getOut().println(); + String confirmation = jline.readLine(Character.valueOf('*')); + this.agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + this.agent.getOut().println(); + } + + return input; + } + + public void close() throws IOException { + InputStream input = jline.getInput(); + if (input != null) { + input.close(); + } + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java new file mode 100644 index 0000000..7003457 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java @@ -0,0 +1,60 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import jline.ConsoleReader; + +public class JavaAgentInputReader implements AgentInputReader { + + private final BufferedReader reader; + private final boolean consoleInput; + + public JavaAgentInputReader() throws IOException { + this.reader = new BufferedReader(new InputStreamReader(System.in)); + this.consoleInput = true; + } + + public JavaAgentInputReader(FileReader fr) throws IOException { + this.reader = new BufferedReader(fr); + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.reader.readLine(); + } + + public String readLineNoEcho() throws IOException { + return this.reader.readLine(); // can't mask the input with this Java API + } + + public void close() throws IOException { + this.reader.close(); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java deleted file mode 100644 index 3de70f4..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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; - -import java.io.FileInputStream; -import java.io.IOException; - -import jline.ConsoleReader; - -public class JlineAgentInputReader implements AgentInputReader { - - private ConsoleReader jline; - - public JlineAgentInputReader() throws IOException { - jline = new ConsoleReader(); - } - - public JlineAgentInputReader(FileInputStream fis) throws IOException { - jline = new ConsoleReader(fis, null); - } - - public String readLine() throws IOException { - return jline.readLine(); - } - - public String readLine(char mask) throws IOException { - return jline.readLine(Character.valueOf(mask)); - } - - public void close() throws IOException { - jline.getInput().close(); - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java new file mode 100644 index 0000000..f3b29ce --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java @@ -0,0 +1,73 @@ +package org.rhq.enterprise.agent; + +import java.io.FileReader; +import java.io.IOException; + +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Uses the SIGAR API when appropriate to read in console input. + * This falls back to the Java-only superclass implementation if + * the native SIGAR API is not available. + * + * @author John Mazzitelli + */ +public class SigarAgentInputReader extends JavaAgentInputReader { + + private final AgentMain agent; + + public SigarAgentInputReader(AgentMain agent) throws IOException { + super(); + this.agent = agent; + } + + public SigarAgentInputReader(AgentMain agent, FileReader fr) throws IOException { + super(fr); + this.agent = agent; + } + + @Override + public String readLine() throws IOException { + String input; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + input = systemInfo.readLineFromConsole(false); + } + + return input; + } + + @Override + public String readLineNoEcho() throws IOException { + String input = null; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + while (true) { + // get the answer the first time + input = systemInfo.readLineFromConsole(true); + + // get the answer a second time + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + String confirmation = systemInfo.readLineFromConsole(true); + systemInfo.writeLineToConsole("\n"); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + } + } + + return input; + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d2aa065..68da9a6 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,6 +28,12 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { + @I18NMessage("Specified bad console type [{0}]") + String AGENT_INPUT_READER_FACTORY_BAD_TYPE = "AgentMain.input-reader-factory-bad-type"; + + @I18NMessage("Failed to create console input reader of type [{0}]") + String AGENT_INPUT_READER_FACTORY_ERROR = "AgentMain.input-reader-factory-error"; + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -549,6 +555,7 @@ public interface AgentI18NResourceKeys { + "\\ -c, --config=<filename> Specifies an agent configuration preferences file (on filesystem or classpath)\\n\\\n" + "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n" + "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n" + + "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n" + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java index 57add17..4c9226a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java @@ -31,6 +31,7 @@ import org.jboss.remoting.security.SSLSocketBuilder; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.AgentPromptInfo; import org.rhq.enterprise.agent.i18n.AgentI18NFactory; import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; import org.rhq.enterprise.agent.i18n.AgentSetupInstructions; @@ -78,11 +79,11 @@ public class SetupPromptCommand implements AgentPromptCommand { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.SETUP_MUST_BE_STOPPED)); } else { if (args.length == 1) { - performBasicSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performBasicSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ADVANCED))) { - performAdvancedSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAdvancedSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ALL))) { - performAllSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAllSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); } commit 1f3d5356a7d1257f86effa4e3f83b604d9bed87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 23:44:13 2010 -0500 start abstracting out the input reader diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java new file mode 100644 index 0000000..dc6644b --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -0,0 +1,54 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.IOException; + +/** + * Abstracts out the console input to allow us to use either a native console or a Java based console. + * + * @author John Mazzitelli + */ +public interface AgentInputReader { + /** + * Reads a line from the input console. + * + * @return the line + * @throws IOException + */ + String readLine() throws IOException; + + /** + * Reads a line from the input console, echoing out the 'mask' character as opposed to the character + * typed by the user. If the console implementation does not support mask echoes, either the + * user-entered character is masked or some other masking is performed in an implementation specific way. + * + * @param mask character to echo back to the user when the user types in the line. + * @return the line typed by the user + * @throws IOException + */ + String readLine(char mask) throws IOException; + + /** + * Close the reader. + * @throws IOException + */ + void close() throws IOException; +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java new file mode 100644 index 0000000..e3ebe4c --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +/** + * Creates implementations of the input reader depending on the need for a native console library. + * + * @author John Mazzitelli + */ +public class AgentInputReaderFactory { + public static AgentInputReader create() throws IOException { + return new JlineAgentInputReader(); + } + public static AgentInputReader create(FileInputStream fis) throws IOException { + return new JlineAgentInputReader(fis); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index d75cb7d..aba4eb5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -21,14 +21,12 @@ package org.rhq.enterprise.agent; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; @@ -58,8 +56,6 @@ import java.util.prefs.Preferences; import javax.management.MBeanServer; import javax.management.ObjectName; -import jline.ConsoleReader; - import mazz.i18n.Logger; import mazz.i18n.Msg; @@ -208,7 +204,7 @@ public class AgentMain { /** * The stream where the commands are input. */ - private ConsoleReader m_input; + private AgentInputReader m_input; /** * Will be <code>true</code> if the input is coming directly from stdin; <code>false</code> if an input script file @@ -463,7 +459,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -804,7 +800,7 @@ public class AgentMain { * * @return the input stream or <code>null</code> if the agent is not currently accepting input */ - public ConsoleReader getIn() { + public AgentInputReader getIn() { return m_input; } @@ -1093,13 +1089,17 @@ public class AgentMain { } } else if (!m_stdinInput) { // if we are processing a script, we hit the EOF, so close the input stream - + try { + m_input.close(); + } catch (IOException e1) { + } // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); } catch (IOException e1) { + m_input = null; } m_stdinInput = true; input_string = ""; @@ -2798,7 +2798,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = new ConsoleReader(new FileInputStream(script), null); + m_input = AgentInputReaderFactory.create(new FileInputStream(script)); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java new file mode 100644 index 0000000..3de70f4 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +import jline.ConsoleReader; + +public class JlineAgentInputReader implements AgentInputReader { + + private ConsoleReader jline; + + public JlineAgentInputReader() throws IOException { + jline = new ConsoleReader(); + } + + public JlineAgentInputReader(FileInputStream fis) throws IOException { + jline = new ConsoleReader(fis, null); + } + + public String readLine() throws IOException { + return jline.readLine(); + } + + public String readLine(char mask) throws IOException { + return jline.readLine(Character.valueOf(mask)); + } + + public void close() throws IOException { + jline.getInput().close(); + } +} commit bd631f0dda01d2f6e594fe1c1f2df92155f4c893 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Feb 2 22:55:14 2010 -0500 fix eclipse settings so that code gets auto-reformatted on save diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 10d36a9..e7120a1 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Jan 14 12:59:22 EST 2010 +#Tue Feb 02 22:50:09 EST 2010 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true cleanup_profile=_RHQ cleanup_settings_version=2 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_RHQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e commit 95511f633370a76ab42b2b4b8eabe4259fff3903 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:36 2010 -0500 put this back in the agent diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 10a1c32a5aee2174b29a02eb70cf3a05b9a1f724 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:20 2010 -0500 opps. this should not be here diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} commit 86270a451083b341baa3710355c9ae4c02292a89 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:14:33 2010 -0500 put this back, but don't integrate it yet diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 80bf4075b6d4c3a84e1b9c788730faa191769657 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:26:27 2010 -0500 fixing .classpath (again) diff --git a/.classpath b/.classpath index 9658f94..3b948dd 100644 --- a/.classpath +++ b/.classpath @@ -112,7 +112,6 @@ <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/virt/src/test/java"/> <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> commit 1b160377f367eda9254a2bf73d1ec0ec89e5b85c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:09:57 2010 -0500 why does antlr-config keep showing up in .classpath? diff --git a/.classpath b/.classpath index ae63f80..9658f94 100644 --- a/.classpath +++ b/.classpath @@ -121,7 +121,6 @@ <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/antlr-config/src/main/antlr3"/> <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/> commit d79827427eaac98f481b5869718e09efd08782f1 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 12:54:16 2010 -0500 BZ 561083 - output warnings if server or agent endpoints use loopback diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 0d900d4..d75cb7d 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -1276,6 +1276,7 @@ public class AgentMain { boolean got_registered = false; int registrationFailures = 0; final int MAX_ALLOWED_REGISTRATION_FAILURES = 5; + boolean hide_loopback_warning = Boolean.getBoolean("rhq.hide-agent-localhost-warning"); while (retry) { try { @@ -1305,8 +1306,14 @@ public class AgentMain { if (sender.isSending()) { LOG.debug(AgentI18NResourceKeys.AGENT_REGISTRATION_ATTEMPT, request); - if (remote_endpoint.contains("127.0.0.1") || remote_endpoint.contains("localhost")) { - LOG.warn(AgentI18NResourceKeys.REGISTERING_WITH_LOOPBACK, remote_endpoint); + if (!hide_loopback_warning) { + if (remote_endpoint.contains("localhost") || remote_endpoint.contains("127.0.0.1")) { + String msg_id = AgentI18NResourceKeys.REGISTERING_WITH_LOOPBACK; + LOG.warn(msg_id, remote_endpoint); + getOut().println(MSG.getMsg(msg_id, remote_endpoint)); + getOut().println(); + hide_loopback_warning = true; // don't bother to tell the user more than once + } } // delete any old token so request is unauthenticated to get server to accept it @@ -2499,6 +2506,25 @@ public class AgentMain { LOG.warn(e, AgentI18NResourceKeys.FAILOVER_LIST_CANNOT_BE_PERSISTED, failoverListFile, ThrowableUtil .getAllMessages(e)); } + + // let's be kind to the user - if any server address is "localhost" or "127.0.0.1" + // or starts with "localhost." (such as localhost.localdomain) then we should output a + // warning to let the user know that that probably isn't what they want. + // In cases when someone is demo'ing/testing/developing, and they don't want to see this, provide + // a way for them to turn off this warning - it could get annoying since it will show up everytime + // the primary switchover thread triggers and needs to persist the list as well as during initial startup/registration. + if (!Boolean.getBoolean("rhq.hide-server-localhost-warning")) { + int numServers = failoverList.size(); + for (int i = 0; i < numServers; i++) { + ServerEntry server = failoverList.get(i); + String addr = (server.address != null) ? server.address : ""; + if ("localhost".equals(addr) || "127.0.0.1".equals(addr) || addr.startsWith("localhost.")) { + LOG.warn(AgentI18NResourceKeys.FAILOVER_LIST_HAS_LOCALHOST, server.address); + getOut().println(MSG.getMsg(AgentI18NResourceKeys.FAILOVER_LIST_HAS_LOCALHOST, server.address)); + break; // just show the warning once + } + } + } } return; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index 7de47a3..d2aa065 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,7 +28,7 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { - @I18NMessage("This agent is registering under the loopback address [{0}] - this should only be done for testing " + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -200,6 +200,12 @@ public interface AgentI18NResourceKeys { @I18NMessage("Too many failover attempts have been made [{0}]. Exception that triggered the failover: [{1}]") String TOO_MANY_FAILOVER_ATTEMPTS = "AgentMain.too-many-failover-attempts"; + @I18NMessage("!!! A server has registered under a loopback address [{0}] - this should only be done for testing and demo purposes. " + + "Only agents running on the same machine as that server will be able to interact with that server successfully. " + + "Please double check that you really want your server to have a public endpoint of [{0}]. " + + "See the Administration > High Availability > Servers menu in the server GUI to change the public endpoint of the server.") + String FAILOVER_LIST_HAS_LOCALHOST = "AgentMain.failover-list-has-localhost"; + @I18NMessage("The server failover list has been loaded from [{0}] - there are [{1}] servers in the list") String FAILOVER_LIST_LOADED = "AgentMain.failover-list-loaded"; commit dcc7af90ef24779dc31919b26c5fab2bced916fe Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:50:50 2010 -0500 Disabled multicast test until we work out its issues with the hudson server. Filed as BZ 561069 to investigate the hudson configuration issues. diff --git a/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java b/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java index 2837893..ba3028b 100644 --- a/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java +++ b/modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java @@ -294,8 +294,14 @@ public class AgentComm4Test extends AgentCommTestBase { * * @throws Exception */ - @Test(enabled = ENABLE_TESTS) + @Test(enabled = false) public void testAutoDiscovery() throws Exception { + + /* Disabled until we work out the issues of running multicast on the hudson server. + + jdobies, Feb 2, 2010 + */ + Properties props1 = new Properties(); props1.setProperty(AgentConfigurationConstants.SERVER_AUTO_DETECTION, "true"); props1.setProperty(AgentConfigurationConstants.CLIENT_SENDER_SERVER_POLLING_INTERVAL, "-1"); commit 28d2d117fe778aad83334a1f14059443d4b1cb8d Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:18:58 2010 -0500 Fixed broken test on recommendation from mazz. diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java index d921934..cdd86fd 100644 --- a/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java @@ -117,7 +117,7 @@ public class JavaTest { */ public void testConcurrency() throws Exception { final SystemInfo sysinfo = SystemInfoFactory.createJavaSystemInfo(); - final int hostname = sysinfo.getHostname().hashCode(); +// final int hostname = sysinfo.getHostname().hashCode(); final int osname = sysinfo.getOperatingSystemName().hashCode(); final int osver = sysinfo.getOperatingSystemVersion().hashCode(); final List<Throwable> errors = new Vector<Throwable>(); @@ -128,7 +128,7 @@ public class JavaTest { try { count.incrementAndGet(); - assert sysinfo.getHostname().hashCode() == hostname; +// assert sysinfo.getHostname().hashCode() == hostname; assert sysinfo.getOperatingSystemName().hashCode() == osname; assert sysinfo.getOperatingSystemVersion().hashCode() == osver; } catch (Throwable t) { commit ef718853fc7e1978f01081928a8b69ce67dc5ca2 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Tue Feb 2 10:00:51 2010 -0500 Revert "Fix the native cleanup so that it will not echo password and will use jline" This reverts commit d19bacd67e857e52428144ab28af5a0c44956df3. Conflicts: modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index e2c6440..0d900d4 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -816,7 +816,22 @@ public class AgentMain { * @return object that can be used to read input with the typed data being echoed or not */ public PromptInput getNativeIn() { - return new JlinePromptInfo(this) ; + SystemInfo sysinfo = null; + + // if we are not in daemon mode, we are running in a console and thus we can try to use + // the native library to get its input. + // If we are in daemon mode, we aren't running in a console so we need to pass null + // in for sysinfo thus causing the prompt info implementation to use our fallback buffered + // reader (which is either empty or is contents of an input file that was piped in via --input. + if (!m_daemonMode) { + // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), + // be able to configure the agent to ignore the native console + if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { + sysinfo = SystemInfoFactory.createSystemInfo(); + } + } + + return new AgentNativePromptInfo(sysinfo, this); } /** diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java index b1cc009..287421d 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java @@ -30,9 +30,7 @@ import org.rhq.enterprise.communications.util.prefs.PromptInput; * will do the same as {@link #readLine()}). * * @author John Mazzitelli - * @deprecated */ -@Deprecated public class AgentNativePromptInfo implements PromptInput { private final SystemInfo systemInfo; private final AgentMain agent; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index cb09997..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)) ; - agent.getOut().println() ; - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println() ; - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println() ; - } - - return input; - } -} \ No newline at end of file commit 2317d8964ea1ee67f80b504ffb5ebe628ceffa7c Author: John Sanda <jsanda(a)redhat.com> Date: Tue Feb 2 08:07:00 2010 -0500 Removing raw-config-test module from plugins build as it is just for testing diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index a0d4924..bd2cc00 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -124,9 +124,6 @@ <module>virt</module> <module>kickstart</module> -  - <module>raw-config-test</module> -  <module>validate-all-plugins</module> </modules>

1 0

[rhq] Branch 'alertPlugin' - modules/core
by Heiko W. Rupp 03 Feb '10

03 Feb '10

modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit e747e439fcdaaa5c23b4cc88c49f4e64c97a5f3f Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Wed Feb 3 15:42:33 2010 +0100 Populate those fields with dummy values - will go away l8er diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index f606de3..d122624 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -101,10 +101,6 @@ public class AlertNotificationLog implements Serializable { public AlertNotificationLog(Alert alert) { AlertDefinition alertDefinition = alert.getAlertDefinition(); - StringBuilder rolesBuilder = new StringBuilder(); - StringBuilder subjectsBuilder = new StringBuilder(); - StringBuilder emailsBuilder = new StringBuilder(); - List<AlertNotification> currentNotifications = alertDefinition.getAlertNotifications(); for (AlertNotification notification : currentNotifications) { //((SnmpNotification)notification). @@ -113,6 +109,9 @@ public class AlertNotificationLog implements Serializable { // always make sure each notification field is non-null by "fixing" it this.alert = alert; + this.roles ="(none)"; + this.subjects ="(none)"; + this.emails ="(none)"; } private String fixup(StringBuilder builder) {

1 0

[rhq] Branch 'alertPlugin' - etc/eclipse-tools modules/core modules/enterprise
by Heiko W. Rupp 03 Feb '10

03 Feb '10

etc/eclipse-tools/hibernate.cfg.xml | 9 modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 4 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 17 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/RoleNotification.java | 129 ------- modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SubjectNotification.java | 129 ------- modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 40 -- modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java | 31 - modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesAction.java | 84 ---- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesForm.java | 122 ------- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesFormPrepareAction.java | 82 ---- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersAction.java | 86 ---- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersForm.java | 123 ------- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersFormPrepareAction.java | 83 ---- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionAction.java | 91 ----- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionFormPrepareAction.java | 57 --- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java | 68 --- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SyslogActionForm.java | 148 -------- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsRolesAction.java | 43 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsUsersAction.java | 43 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionAction.java | 61 --- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 45 -- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml | 45 -- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventRoles.jsp | 44 -- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventUsers.jsp | 44 -- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListRoles.jsp | 27 - modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListUsers.jsp | 30 - modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp | 49 -- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp | 45 -- modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 32 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 174 ---------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 21 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 41 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 41 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java | 18 - 40 files changed, 14 insertions(+), 2132 deletions(-) New commits: commit f9f5d99c36530d167b3e22ab545d6920d1072dd0 Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org> Date: Wed Feb 3 10:51:35 2010 +0100 Clean out old stuff that is no longer needed du to alert plugins. diff --git a/etc/eclipse-tools/hibernate.cfg.xml b/etc/eclipse-tools/hibernate.cfg.xml index a4160cf..b335365 100644 --- a/etc/eclipse-tools/hibernate.cfg.xml +++ b/etc/eclipse-tools/hibernate.cfg.xml @@ -18,8 +18,8 @@ <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> <property name="hibernate.dialect">org.hibernate.dialect.OracleDialect</property> --> - - <property name="hibernate.cache.use_second_level_cache">false</property> + + <property name="hibernate.cache.use_second_level_cache">false</property> <property name="hibernate.cache.use_query_cache">false</property> <mapping class="org.rhq.core.domain.auth.Principal" /> @@ -106,10 +106,7 @@ <mapping class="org.rhq.core.domain.alert.AlertDefinition" /> <mapping class="org.rhq.core.domain.alert.notification.AlertNotification" /> <mapping class="org.rhq.core.domain.alert.notification.AlertNotificationLog" /> - <mapping class="org.rhq.core.domain.alert.notification.EmailNotification" /> - <mapping class="org.rhq.core.domain.alert.notification.RoleNotification" /> - <mapping class="org.rhq.core.domain.alert.notification.SnmpNotification" /> - <mapping class="org.rhq.core.domain.alert.notification.SubjectNotification" /> + <mapping class="org.rhq.core.domain.alert.notification.NotificationTemplate" /> <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataKey" /> <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataValue" /> <mapping class="org.rhq.core.domain.resource.group.Group" /> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index a0481b7..a3da84c 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -22,7 +22,7 @@ <properties> <scm.module.path>modules/core/dbutils/</scm.module.path> - <db.schema.version>2.77.2</db.schema.version> + <db.schema.version>2.77.3</db.schema.version> </properties> <dependencies> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml index 2cbba05..6a06d64 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml @@ -133,8 +133,6 @@ <column name="NOTIFICATION_TYPE" required="true" size="20" type="VARCHAR2"/> <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/> <column name="NOTIF_TEMPLATE_ID" required="false" type="INTEGER" references="RHQ_ALERT_NOTIF_TEMPL(ID)"/> - <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE(ID)"/> - <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT(ID)"/> <column name="ALERT_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/> <column name="ALERT_SENDER_NAME" required="false" size="100" type="VARCHAR2" />  <column name="ALERT_ORDER" type="INTEGER" /> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index e9cb6ce..c3d4006 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -3014,6 +3014,10 @@ <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="snmp_oid"/> <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="email_address"/> </schemaSpec> + <schemaSpec version="2.77.3"> + <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="role_id"/> + <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="subject_id"/> + </schemaSpec> </dbupgrade> </target> </project> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 531a1cd..f606de3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -107,28 +107,11 @@ public class AlertNotificationLog implements Serializable { List<AlertNotification> currentNotifications = alertDefinition.getAlertNotifications(); for (AlertNotification notification : currentNotifications) { - if (notification instanceof RoleNotification) { - if (rolesBuilder.length() != 0) { - rolesBuilder.append(", "); - } - - rolesBuilder.append(((RoleNotification) notification).getRole().getName()); - } else if (notification instanceof SubjectNotification) { - if (subjectsBuilder.length() != 0) { - subjectsBuilder.append(", "); - } - - subjectsBuilder.append(((SubjectNotification) notification).getSubject().getName()); - } else { //((SnmpNotification)notification). // TODO: log that this type of AlertNotification is not supported yet for auditing - } } // always make sure each notification field is non-null by "fixing" it - roles = fixup(rolesBuilder); - subjects = fixup(subjectsBuilder); - emails = fixup(emailsBuilder); this.alert = alert; } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/RoleNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/RoleNotification.java deleted file mode 100644 index 696895b..0000000 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/RoleNotification.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.core.domain.alert.notification; - -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; - -import org.jetbrains.annotations.NotNull; - -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.core.domain.authz.Role; - -@DiscriminatorValue("ROLE") -@Entity -@NamedQueries( { - @NamedQuery(name = RoleNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID, query = "SELECT rn " - + " FROM RoleNotification rn " + " WHERE rn.alertDefinition.id = :alertDefinitionId "), - @NamedQuery(name = RoleNotification.QUERY_FIND_BY_IDS, query = "SELECT rn " + " FROM RoleNotification rn " - + " WHERE rn.id IN ( :ids )"), - @NamedQuery(name = RoleNotification.QUERY_FIND_BY_ROLE_IDS, query = "SELECT rn " + " FROM RoleNotification rn " - + " WHERE rn.role.id IN ( :ids )") }) -@Deprecated -public class RoleNotification extends AlertNotification { - - private static final long serialVersionUID = 1L; - - public static final String QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID = "RoleNotification.findAllByAlertDefinitionId"; - public static final String QUERY_FIND_BY_IDS = "RoleNotification.findByIds"; - public static final String QUERY_FIND_BY_ROLE_IDS = "SubjectNotification.findByRoleIds"; - - @JoinColumn(name = "ROLE_ID", referencedColumnName = "ID", nullable = true) - @ManyToOne - private Role role; - - protected RoleNotification() { - } // JPA spec - - public RoleNotification(RoleNotification roleNotification) { - this(roleNotification.getAlertDefinition(), roleNotification.role); - } - - public RoleNotification(@NotNull AlertDefinition alertDefinition, @NotNull Role role) { - super(alertDefinition); - if (role == null) { - throw new IllegalArgumentException("role must be non-null."); - } - - this.role = role; - } - - @NotNull - public Role getRole() { - return role; - } - - @Override - protected AlertNotification copy() { - return new RoleNotification(this); - } - - @Override - public void prepareForOrphanDelete() { - super.prepareForOrphanDelete(); - role = null; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = (prime * result) + ((role == null) ? 0 : role.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (!(obj instanceof RoleNotification)) { - return false; - } - - final RoleNotification other = (RoleNotification) obj; - if (role == null) { - if (other.role != null) { - return false; - } - } else if (!role.equals(other.role)) { - return false; - } - - return true; - } - - @Override - public String toString() { - return this.getClass().getSimpleName() + "[" + "id=" + getId() + ", " + "role=" + this.role + ", " + "]"; - } -} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SubjectNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SubjectNotification.java deleted file mode 100644 index 18a90bc..0000000 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SubjectNotification.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.core.domain.alert.notification; - -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; - -import org.jetbrains.annotations.NotNull; - -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.core.domain.auth.Subject; - -@DiscriminatorValue("SUBJECT") -@Entity -@NamedQueries( { - @NamedQuery(name = SubjectNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID, query = "SELECT sn " - + " FROM SubjectNotification sn " + " WHERE sn.alertDefinition.id = :alertDefinitionId "), - @NamedQuery(name = SubjectNotification.QUERY_FIND_BY_IDS, query = "SELECT sn " + " FROM SubjectNotification sn " - + " WHERE sn.id IN ( :ids )"), - @NamedQuery(name = SubjectNotification.QUERY_FIND_BY_SUBJECT_IDS, query = "SELECT sn " - + " FROM SubjectNotification sn " + " WHERE sn.subject.id IN ( :ids )") }) -@Deprecated -public class SubjectNotification extends AlertNotification { - - private static final long serialVersionUID = 1L; - - public static final String QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID = "SubjectNotification.findAllByAlertDefinitionId"; - public static final String QUERY_FIND_BY_IDS = "SubjectNotification.findByIds"; - public static final String QUERY_FIND_BY_SUBJECT_IDS = "SubjectNotification.findBySubjectIds"; - - @JoinColumn(name = "SUBJECT_ID", referencedColumnName = "ID", nullable = true) - @ManyToOne - private Subject subject; - - protected SubjectNotification() { - } // JPA spec - - public SubjectNotification(SubjectNotification subjectNotification) { - this(subjectNotification.getAlertDefinition(), subjectNotification.subject); - } - - public SubjectNotification(@NotNull AlertDefinition alertDefinition, @NotNull Subject subject) { - super(alertDefinition); - if (subject == null) { - throw new IllegalArgumentException("subject must be non-null."); - } - - this.subject = subject; - } - - @NotNull - public Subject getSubject() { - return subject; - } - - @Override - protected AlertNotification copy() { - return new SubjectNotification(this); - } - - @Override - public void prepareForOrphanDelete() { - super.prepareForOrphanDelete(); - subject = null; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = (prime * result) + ((subject == null) ? 0 : subject.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (!(obj instanceof SubjectNotification)) { - return false; - } - - final SubjectNotification other = (SubjectNotification) obj; - if (subject == null) { - if (other.subject != null) { - return false; - } - } else if (!subject.equals(other.subject)) { - return false; - } - - return true; - } - - @Override - public String toString() { - return this.getClass().getSimpleName() + "[" + "id=" + getId() + ", " + "subject=" + this.subject + ", " + "]"; - } -} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 2aadf7d..f13d6ef 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -49,7 +49,6 @@ import javax.persistence.Transient; import org.jetbrains.annotations.NotNull; -import org.rhq.core.domain.alert.notification.SubjectNotification; import org.rhq.core.domain.authz.Role; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.util.EntitySerializer; @@ -140,28 +139,6 @@ import org.rhq.core.domain.util.serial.ExternalizableStrategy; + "FROM Subject s, IN (s.roles) r, IN (r.permissions) p, IN (r.resourceGroups) g, IN (g.implicitResources) res " + "WHERE s = :subject AND p = :permission"), - @NamedQuery(name = Subject.QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION_WITH_EXCLUDES, query = "" // - + "SELECT s" + " FROM Subject s" // - + " WHERE s.id NOT IN" // - + " ( " // - + " SELECT sn.subject.id" // - + " FROM SubjectNotification sn" // - + " WHERE sn.alertDefinition.id = :alertDefinitionId " // - + " ) " // - + " AND s.id NOT IN ( :excludes ) " // - + " AND s.fsystem = FALSE " // - + " AND s.factive = TRUE"), - @NamedQuery(name = Subject.QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION, query = "" // - + "SELECT s" // - + " FROM Subject s" // - + " WHERE s.id NOT IN" // - + " ( " // - + " SELECT sn.subject.id" // - + " FROM SubjectNotification sn" // - + " WHERE sn.alertDefinition.id = :alertDefinitionId " // - + " ) " // - + " AND s.fsystem = FALSE" // - + " AND s.factive = TRUE"), // @NamedQuery(name = Subject.QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ROLE_WITH_EXCLUDES, query = "" // + "SELECT DISTINCT s " + " FROM Subject AS s LEFT JOIN s.roles AS r " // + " WHERE s.id NOT IN " // @@ -211,8 +188,6 @@ public class Subject implements Externalizable { public static final String QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ROLE_WITH_EXCLUDES = "Subject.findAvailableSubjectsForRoleWithExcludes"; public static final String QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ROLE = "Subject.findAvailableSubjectsForRole"; - public static final String QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION_WITH_EXCLUDES = "Subject.findAvailableSubjectsForAlertDefinitionWithExcludes"; - public static final String QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION = "Subject.findAvailableSubjectForAlertDefinition"; public static final String QUERY_DYNAMIC_CONFIG_VALUES = "Subject.dynamicConfigValues"; @@ -258,9 +233,6 @@ public class Subject implements Externalizable { @ManyToMany private java.util.Set<Role> roles; - @OneToMany(mappedBy = "subject", cascade = javax.persistence.CascadeType.ALL) - private Set<SubjectNotification> subjectNotifications = new HashSet<SubjectNotification>(); - @Transient private Integer sessionId = null; @@ -410,18 +382,6 @@ public class Subject implements Externalizable { getRoles().remove(role); } - public Set<SubjectNotification> getSubjectNotifications() { - return subjectNotifications; - } - - public void setSubjectNotifications(Set<SubjectNotification> subjectNotifications) { - this.subjectNotifications = subjectNotifications; - } - - public void addSubjectNotification(SubjectNotification subjectNotification) { - this.subjectNotifications.add(subjectNotification); - } - @Override public String toString() { return "org.rhq.core.domain.auth.Subject[id=" + id + ",name=" + name + "]"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java index 482fa08..35772bd 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java @@ -46,7 +46,6 @@ import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.CollectionOfElements; import org.jetbrains.annotations.NotNull; -import org.rhq.core.domain.alert.notification.RoleNotification; import org.rhq.core.domain.auth.Subject; /** @@ -78,19 +77,6 @@ import org.rhq.core.domain.auth.Subject; + " FROM Subject ss " // + " JOIN ss.roles AS rr " // + " WHERE ss.id = :subjectId )"), // - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION_WITH_EXCLUDES, query = "" // - + "SELECT r" // - + " FROM Role r" // - + " WHERE r.id NOT IN ( SELECT rn.role.id " // - + " FROM RoleNotification rn" // - + " WHERE rn.alertDefinition.id = :alertDefinitionId ) " // - + " AND r.id NOT IN ( :excludes )"), // - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION, query = "" // - + "SELECT r" // - + " FROM Role r" // - + " WHERE r.id NOT IN ( SELECT rn.role.id " // - + " FROM RoleNotification rn" // - + " WHERE rn.alertDefinition.id = :alertDefinitionId ) "), // @NamedQuery(name = Role.QUERY_DYNAMIC_CONFIG_VALUES, query = "" // + "SELECT r.name, r.name FROM Role AS r") }) @@ -101,8 +87,6 @@ public class Role implements Serializable { public static final String QUERY_FIND_BY_IDS = "Role.findByIds"; public static final String QUERY_FIND_AVAILABLE_ROLES_WITH_EXCLUDES = "Role.findAvailableRolesWithExcludes"; public static final String QUERY_FIND_AVAILABLE_ROLES = "Role.findAvailableRoles"; - public static final String QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION_WITH_EXCLUDES = "Role.findAvailableRolesForAlertDefinitionWithExcludes"; - public static final String QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION = "Role.findAvailableRolesForAlertDefinition"; public static final String QUERY_DYNAMIC_CONFIG_VALUES = "Role.dynamicConfigValues"; @@ -134,9 +118,6 @@ public class Role implements Serializable { @JoinTable(name = "RHQ_PERMISSION", joinColumns = @JoinColumn(name = "ROLE_ID")) private Set<Permission> permissions = new HashSet<Permission>(); - @OneToMany(mappedBy = "role", cascade = javax.persistence.CascadeType.ALL) - private Set<RoleNotification> roleNotifications = new HashSet<RoleNotification>(); - protected Role() { fsystem = Boolean.FALSE; } @@ -251,18 +232,6 @@ public class Role implements Serializable { this.resourceGroups.remove(resourceGroup); } - public Set<RoleNotification> getRoleNotifications() { - return roleNotifications; - } - - public void setRoleNotifications(Set<RoleNotification> roleNotifications) { - this.roleNotifications = roleNotifications; - } - - public void addRoleNotification(RoleNotification roleNotification) { - this.roleNotifications.add(roleNotification); - } - public int getMemberCount() { int count = 0; for (Subject member : getSubjects()) { diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java index 4d873f6..530acb1 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java @@ -45,8 +45,6 @@ import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionLog; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.AlertNotification; -import org.rhq.core.domain.alert.notification.RoleNotification; -import org.rhq.core.domain.alert.notification.SubjectNotification; import org.rhq.core.domain.auth.Principal; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Role; @@ -122,8 +120,6 @@ public class QueryAllTest extends AbstractEJB3Test { AlertConditionLog.class.getSimpleName(), AlertDefinition.class.getSimpleName(), AlertNotification.class.getSimpleName(), - RoleNotification.class.getSimpleName(), - SubjectNotification.class.getSimpleName(), // measurement stuff MeasurementDataTrait.class.getSimpleName(), diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesAction.java deleted file mode 100644 index 66b2005..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesAction.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.enterprise.gui.legacy.Constants; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; -import org.rhq.enterprise.gui.legacy.util.SessionUtils; -import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * An action that adds roles to an alert definition in the BizApp. - */ -public class AddRolesAction extends AddNotificationsAction { - private Log log = LogFactory.getLog(AddRolesAction.class); - - @Override - @SuppressWarnings("deprecation") - protected ActionForward process(ActionMapping mapping, AddNotificationsForm form, HttpServletRequest request, - Map<String, Integer> params) throws Exception { - AddRolesForm addForm = (AddRolesForm) form; - ActionForward forward = checkSubmit(request, mapping, addForm, params); - HttpSession session = request.getSession(); - Subject subject = RequestUtils.getSubject(request); - - if (forward != null) { - if (addForm.isCancelClicked() || addForm.isResetClicked()) { - log.debug("removing pending role list"); - SessionUtils.removeList(session, Constants.PENDING_ROLES_SES_ATTR); - } else if (addForm.isAddClicked()) { - log.debug("adding to pending role list"); - SessionUtils.addToList(session, Constants.PENDING_ROLES_SES_ATTR, addForm.getAvailableRoles()); - log.debug("@@@@@@@@@@" + addForm.getAvailableRoles().toString()); - } else if (addForm.isRemoveClicked()) { - log.debug("removing from pending role list"); - SessionUtils.removeFromList(session, Constants.PENDING_ROLES_SES_ATTR, addForm.getPendingRoles()); - } - - return forward; - } - - log.debug("getting pending role list"); - Integer[] pendingRoleIds = SessionUtils.getList(session, Constants.PENDING_ROLES_SES_ATTR); - for (int i = 0; i < pendingRoleIds.length; i++) { - log.debug("adding role [" + pendingRoleIds[i] + "] for alert definition [" + addForm.getAd() + "]"); - } - - AlertNotificationManagerLocal alertNotificationManager = LookupUtil.getAlertNotificationManager(); - alertNotificationManager.addRoleNotifications(subject, addForm.getAd(), pendingRoleIds); - - log.debug("remove pending role list"); - SessionUtils.removeList(session, Constants.PENDING_ROLES_SES_ATTR); - - RequestUtils.setConfirmation(request, "alerts.config.confirm.AddRoles"); - return returnSuccess(request, mapping, params); - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesForm.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesForm.java deleted file mode 100644 index 6f4dea8..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesForm.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionMapping; - -/** - * An extension of <code>BaseValidatorForm</code> representing the <em>Add Role</em> form. - */ -public class AddRolesForm extends AddNotificationsForm { - private Integer[] availableRoles; - private Integer[] pendingRoles; - private Integer psa; - private Integer psp; - - public AddRolesForm() { - super(); - } - - public Integer[] getAvailableRole() { - return this.availableRoles; - } - - public Integer[] getAvailableRoles() { - return getAvailableRole(); - } - - public void setAvailableRole(Integer[] availableRoles) { - this.availableRoles = availableRoles; - } - - public void setAvailableRoles(Integer[] availableRoles) { - setAvailableRole(availableRoles); - } - - public Integer[] getPendingRole() { - return this.pendingRoles; - } - - public Integer[] getPendingRoles() { - return getPendingRole(); - } - - public void setPendingRole(Integer[] pendingRoles) { - this.pendingRoles = pendingRoles; - } - - public void setPendingRoles(Integer[] pendingRoles) { - setPendingRole(pendingRoles); - } - - public Integer getPsa() { - return this.psa; - } - - public void setPsa(Integer ps) { - this.psa = ps; - } - - public Integer getPsp() { - return this.psp; - } - - public void setPsp(Integer ps) { - this.psp = ps; - } - - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { - this.availableRoles = new Integer[0]; - this.pendingRoles = new Integer[0]; - this.psa = null; - this.psp = null; - super.reset(mapping, request); - } - - @Override - public String toString() { - StringBuffer s = new StringBuffer(super.toString()); - s.append("ad=" + ad + " "); - s.append("psa=" + psa + " "); - s.append("psp=" + psp + " "); - - s.append("availableRoles={"); - listToString(s, availableRoles); - s.append("} "); - - s.append("pendingRoles={"); - listToString(s, pendingRoles); - s.append("}"); - - return s.toString(); - } - - private void listToString(StringBuffer s, Integer[] l) { - if (l != null) { - for (int i = 0; i < l.length; i++) { - s.append(l[i]); - if (i < (l.length - 1)) { - s.append(", "); - } - } - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesFormPrepareAction.java deleted file mode 100644 index 3d7d9f7..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesFormPrepareAction.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.ComponentContext; -import org.apache.struts.tiles.actions.TilesAction; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.authz.Role; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.legacy.Constants; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; -import org.rhq.enterprise.gui.legacy.util.SessionUtils; -import org.rhq.enterprise.gui.util.WebUtility; -import org.rhq.enterprise.server.authz.RoleManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * An Action that retrieves data from the BizApp to facilitate display of the form to add roles to AlertDefinition. - */ -public class AddRolesFormPrepareAction extends TilesAction { - private Log log = LogFactory.getLog(AddRolesFormPrepareAction.class); - - @Override - @SuppressWarnings("deprecation") - public ActionForward execute(ComponentContext context, ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) throws Exception { - AddRolesForm addForm = (AddRolesForm) form; - Subject subject = RequestUtils.getSubject(request); - - PageControl pcp = WebUtility.getPageControl(request, "p"); - PageControl pca = WebUtility.getPageControl(request, "a"); - - log.trace("available page control: " + pca); - log.trace("pending page control: " + pcp); - - RoleManagerLocal roleManager = LookupUtil.getRoleManager(); - - /* - * pending users are those on the right side of the "add to list" widget - awaiting association with the Alert - * Definition when the form's "ok" button is clicked. - */ - Integer[] pendingIds = SessionUtils.getList(request.getSession(), Constants.PENDING_ROLES_SES_ATTR); - - log.trace("getting pending roles for alert definition [" + addForm.getAd() + "]"); - PageList<Role> pendingUsers = roleManager.findRolesByIds(pendingIds, pcp); - request.setAttribute(Constants.PENDING_ROLES_ATTR, pendingUsers); - - /* - * available users are all users in the system that are _not_ associated with the definition and are not pending - */ - log.trace("getting available roles for alert definition [" + addForm.getAd() + "]"); - PageList<Role> availableUsers = roleManager.findAvailableRolesForAlertDefinition(subject, addForm.getAd(), - pendingIds, pca); - request.setAttribute(Constants.AVAIL_ROLES_ATTR, availableUsers); - - return null; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersAction.java deleted file mode 100644 index 6c05694..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersAction.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.enterprise.gui.legacy.Constants; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; -import org.rhq.enterprise.gui.legacy.util.SessionUtils; -import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * An action that adds users to an alert definition in the BizApp. - */ -public class AddUsersAction extends AddNotificationsAction { - private Log log = LogFactory.getLog(AddUsersAction.class); - - @Override - protected ActionForward process(ActionMapping mapping, AddNotificationsForm form, HttpServletRequest request, - Map<String, Integer> params) throws Exception { - AddUsersForm addForm = (AddUsersForm) form; - ActionForward forward = checkSubmit(request, mapping, form, params); - HttpSession session = request.getSession(); - Subject subject = RequestUtils.getSubject(request); - - if (forward != null) { - if (addForm.isCancelClicked() || addForm.isResetClicked()) { - log.debug("removing pending user list"); - SessionUtils.removeList(session, Constants.PENDING_USERS_SES_ATTR); - } else if (addForm.isAddClicked()) { - log.debug("adding to pending user list"); - SessionUtils.addToList(session, Constants.PENDING_USERS_SES_ATTR, addForm.getAvailableUsers()); - log.debug("@@@@@@@@@@" + addForm.getAvailableUsers().toString()); - for (int i = 0; i < addForm.getAvailableUsers().length; i++) { - log.debug("Avalilable Users " + addForm.getAvailableUsers()[i]); - } - } else if (addForm.isRemoveClicked()) { - log.debug("removing from pending user list"); - SessionUtils.removeFromList(session, Constants.PENDING_USERS_SES_ATTR, addForm.getPendingUsers()); - } - - return forward; - } - - log.debug("getting pending user list"); - Integer[] pendingUserIds = SessionUtils.getList(session, Constants.PENDING_USERS_SES_ATTR); - for (int i = 0; i < pendingUserIds.length; i++) { - log.debug("adding user [" + pendingUserIds[i] + "] for alert definition [" + addForm.getAd() + "]"); - } - - AlertNotificationManagerLocal alertNotificationManager = LookupUtil.getAlertNotificationManager(); - alertNotificationManager.addSubjectNotifications(subject, addForm.getAd(), pendingUserIds); - - log.debug("remove pending user list"); - SessionUtils.removeList(session, Constants.PENDING_USERS_SES_ATTR); - - RequestUtils.setConfirmation(request, "alerts.config.confirm.AddRoles"); - return returnSuccess(request, mapping, params); - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersForm.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersForm.java deleted file mode 100644 index 7b5600e..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersForm.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionMapping; - -/** - * An extension of <code>BaseValidatorForm</code> representing the <em>Add Role Users</em> form. - */ -public class AddUsersForm extends AddNotificationsForm { - private Integer[] availableUsers; - private Integer[] pendingUsers; - private Integer psa; - private Integer psp; - - public AddUsersForm() { - super(); - } - - public Integer[] getAvailableUser() { - return this.availableUsers; - } - - public Integer[] getAvailableUsers() { - return getAvailableUser(); - } - - public void setAvailableUser(Integer[] availableUsers) { - this.availableUsers = availableUsers; - } - - public void setAvailableUsers(Integer[] availableUsers) { - setAvailableUser(availableUsers); - } - - public Integer[] getPendingUser() { - return this.pendingUsers; - } - - public Integer[] getPendingUsers() { - return getPendingUser(); - } - - public void setPendingUser(Integer[] pendingUsers) { - this.pendingUsers = pendingUsers; - } - - public void setPendingUsers(Integer[] pendingUsers) { - setPendingUser(pendingUsers); - } - - public Integer getPsa() { - return this.psa; - } - - public void setPsa(Integer ps) { - this.psa = ps; - } - - public Integer getPsp() { - return this.psp; - } - - public void setPsp(Integer ps) { - this.psp = ps; - } - - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { - this.availableUsers = new Integer[0]; - this.pendingUsers = new Integer[0]; - this.psa = null; - this.psp = null; - this.ad = null; - super.reset(mapping, request); - } - - @Override - public String toString() { - StringBuffer s = new StringBuffer(super.toString()); - s.append("ad=" + ad + " "); - s.append("psa=" + psa + " "); - s.append("psp=" + psp + " "); - - s.append("availableUsers={"); - listToString(s, availableUsers); - s.append("} "); - - s.append("pendingUsers={"); - listToString(s, pendingUsers); - s.append("}"); - - return s.toString(); - } - - private void listToString(StringBuffer s, Integer[] l) { - if (l != null) { - for (int i = 0; i < l.length; i++) { - s.append(l[i]); - if (i < (l.length - 1)) { - s.append(", "); - } - } - } - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersFormPrepareAction.java deleted file mode 100644 index 86eef34..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersFormPrepareAction.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.ComponentContext; -import org.apache.struts.tiles.actions.TilesAction; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.legacy.Constants; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; -import org.rhq.enterprise.gui.legacy.util.SessionUtils; -import org.rhq.enterprise.gui.util.WebUtility; -import org.rhq.enterprise.server.auth.SubjectManagerLocal; -import org.rhq.enterprise.server.authz.RoleManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * An Action that retrieves data from the BizApp to facilitate display of the form to add users to AlertDefinition. - */ -public class AddUsersFormPrepareAction extends TilesAction { - private Log log = LogFactory.getLog(AddUsersFormPrepareAction.class); - - @Override - @SuppressWarnings("deprecation") - public ActionForward execute(ComponentContext context, ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) throws Exception { - AddUsersForm addForm = (AddUsersForm) form; - Subject subject = RequestUtils.getSubject(request); - - PageControl pcp = WebUtility.getPageControl(request, "p"); - PageControl pca = WebUtility.getPageControl(request, "a"); - - log.trace("available page control: " + pca); - log.trace("pending page control: " + pcp); - - SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); - RoleManagerLocal roleManager = LookupUtil.getRoleManager(); - - /* - * pending users are those on the right side of the "add to list" widget - awaiting association with the Alert - * Definition when the form's "ok" button is clicked. - */ - Integer[] pendingIds = SessionUtils.getList(request.getSession(), Constants.PENDING_USERS_SES_ATTR); - - log.trace("getting pending users for alert definition [" + addForm.getAd() + "]"); - PageList<Subject> pendingUsers = subjectManager.findSubjectsById(pendingIds, pcp); - request.setAttribute(Constants.PENDING_USERS_ATTR, pendingUsers); - - /* - * available users are all users in the system that are _not_ associated with the definition and are not pending - */ - log.trace("getting available users for alert definition [" + addForm.getAd() + "]"); - PageList<Subject> availableUsers = subjectManager.findAvailableSubjectsForAlertDefinition(subject, addForm - .getAd(), pendingIds, pca); - request.setAttribute(Constants.AVAIL_USERS_ATTR, availableUsers); - - return null; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionAction.java deleted file mode 100644 index a65aec2..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionAction.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import java.util.HashMap; -import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.rhq.enterprise.gui.legacy.Constants; -import org.rhq.enterprise.gui.legacy.action.BaseAction; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; - -/** - * Create a new alert definition. - */ -public class EditDefinitionSyslogActionAction extends BaseAction { - private Log log = LogFactory.getLog(EditDefinitionSyslogActionAction.class.getName()); - - // ---------------------------------------------------- Public Methods - - @Override - public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - SyslogActionForm saForm = (SyslogActionForm) form; - - ServletContext ctx = getServlet().getServletContext(); - int sessionID = RequestUtils.getSessionId(request).intValue(); - Integer rid = saForm.getRid(); - // Integer type = saForm.getType(); - // EventsBoss eb = ContextUtils.getEventsBoss(ctx); - - Map params = new HashMap(); - params.put(Constants.RESOURCE_PARAM, rid); - // params.put(Constants.RESOURCE_TYPE_ID_PARAM, type); - params.put("ad", saForm.getAd()); - - ActionForward forward = checkSubmit(request, mapping, form, params); - if (forward != null) { - log.trace("returning " + forward); - return forward; - } - - // AlertDefinition alertDef = eb.getAlertDefinition( sessionID, saForm.getAd() ); - // Action action = AlertDefUtil.getSyslogActionValue(alertDef); - // if ( saForm.getShouldBeRemoved() ) { - // if (null != action) { - // alertDef.removeAction(action); - // eb.updateAlertDefinition(sessionID, alertDef); - // } - // } else { - // SyslogActionConfig sa = new SyslogActionConfig(); - // sa.setMeta( saForm.getMetaProject() ); - // sa.setProduct( saForm.getProject() ); - // sa.setVersion( saForm.getVersion() ); - // ConfigResponse configResponse = sa.getConfigResponse(); - // if (null == action) { - // eb.createAction( sessionID, saForm.getAd(), - // sa.getImplementor(), configResponse ); - // } else { - // action.setConfig( configResponse.encode() ); - // eb.updateAction(sessionID, action); - // } - // } - - return returnSuccess(request, mapping, params); - } -} - -// EOF diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionFormPrepareAction.java deleted file mode 100644 index d8d1d66..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionFormPrepareAction.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.ComponentContext; -import org.apache.struts.tiles.actions.TilesAction; - -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.AlertDefUtil; - -/** - * An Action that retrieves data from the BizApp to facilitate display of the <em>Edit Alert Definition Syslog - * Action</em> form. - */ -public class EditDefinitionSyslogActionFormPrepareAction extends TilesAction { - protected Log log = LogFactory.getLog(EditDefinitionSyslogActionFormPrepareAction.class.getName()); - - // ---------------------------------------------------- Public Methods - - @Override - public ActionForward execute(ComponentContext context, ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) throws Exception { - SyslogActionForm saForm = (SyslogActionForm) form; - - // properties - AlertDefinition alertDef = AlertDefUtil.getAlertDefinition(request); - //AlertDefUtil.prepareSyslogActionForm(alertDef, saForm); - - return null; - } -} - -// EOF diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java index 07bcc1e..d35ed67 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java @@ -67,13 +67,7 @@ public class PortalAction extends ResourceController { keyMethodMap.setProperty("editProperties", "editDefinitionProperties"); keyMethodMap.setProperty("editConditions", "editDefinitionConditions"); keyMethodMap.setProperty("editControlAction", "editDefinitionControlAction"); - keyMethodMap.setProperty("editSyslogAction", "editDefinitionSyslogAction"); - keyMethodMap.setProperty("viewRoles", "viewDefinitionRoles"); - keyMethodMap.setProperty("viewUsers", "viewDefinitionUsers"); - - keyMethodMap.setProperty("addRoles", "addRolesDefinitions"); - keyMethodMap.setProperty("addUsers", "addUsersDefinitions"); } @Override @@ -173,44 +167,6 @@ public class PortalAction extends ResourceController { return null; } - public ActionForward editDefinitionSyslogAction(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - setResource(request); - Portal portal = Portal.createPortal(); - setTitle(request, portal, "alerts.config.platform.EditSyslogAction.Title"); - portal.addPortlet(new Portlet(".events.config.edit.syslogaction"), 1); - portal.setDialog(true); - request.setAttribute(Constants.PORTAL_KEY, portal); - - return null; - } - - public ActionForward viewDefinitionRoles(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - setResource(request); - Portal portal = Portal.createPortal(); - setTitle(request, portal, "alert.config.platform.props.ViewDef.roles.Title"); - portal.addPortlet(new Portlet(".events.config.view.roles"), 1); - - // JW - this shouldn't be a dialog ... portal.setDialog(true); - request.setAttribute(Constants.PORTAL_KEY, portal); - - return null; - } - - public ActionForward viewDefinitionUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - setResource(request); - Portal portal = Portal.createPortal(); - setTitle(request, portal, "alert.config.platform.props.ViewDef.users.Title"); - portal.addPortlet(new Portlet(".events.config.view.users"), 1); - - // JW - this shouldn't be a dialog ... portal.setDialog(true); - request.setAttribute(Constants.PORTAL_KEY, portal); - - return null; - } - public ActionForward monitorConfigureAlerts(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -258,30 +214,6 @@ public class PortalAction extends ResourceController { return null; } - public ActionForward addUsersDefinitions(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - setResource(request); - Portal portal = Portal.createPortal(); - setTitle(request, portal, "alerts.config.platform.AssignUsersToAlertDefinition.Title"); - portal.addPortlet(new Portlet(".events.config.addusers"), 1); - portal.setDialog(false); - - request.setAttribute(Constants.PORTAL_KEY, portal); - return null; - } - - public ActionForward addRolesDefinitions(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - setResource(request); - Portal portal = Portal.createPortal(); - setTitle(request, portal, "alerts.config.platform.AssignRolesToAlertDefinition.Title"); - portal.addPortlet(new Portlet(".events.config.addroles"), 1); - portal.setDialog(false); - - request.setAttribute(Constants.PORTAL_KEY, portal); - return null; - } - /** * This sets the return path for a ResourceAction by appending the type and resource id to the forward url. * diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SyslogActionForm.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SyslogActionForm.java deleted file mode 100644 index 19fbb93..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SyslogActionForm.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.validator.GenericValidator; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.rhq.enterprise.gui.legacy.action.resource.ResourceForm; -import org.rhq.enterprise.gui.legacy.util.RequestUtils; - -/** - * Form for editing the control action for an alert definition. - */ -public final class SyslogActionForm extends ResourceForm { - private Log log = LogFactory.getLog(SyslogActionForm.class.getName()); - - //-------------------------------------instance variables - - // control action properties - private Integer id; // nullable - private Integer ad; // nullable - private String metaProject; - private String project; - private String version; - private boolean shouldBeRemoved; - - //-------------------------------------constructors - - public SyslogActionForm() { - // do nothing - } - - //-------------------------------------public methods - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getAd() { - return this.ad; - } - - public void setAd(Integer ad) { - this.ad = ad; - } - - public String getMetaProject() { - return this.metaProject; - } - - public void setMetaProject(String metaProject) { - this.metaProject = metaProject; - } - - public String getProject() { - return this.project; - } - - public void setProject(String project) { - this.project = project; - } - - public String getVersion() { - return this.version; - } - - public void setVersion(String version) { - this.version = version; - } - - public boolean getShouldBeRemoved() { - return this.shouldBeRemoved; - } - - public void setShouldBeRemoved(boolean shouldBeRemoved) { - this.shouldBeRemoved = shouldBeRemoved; - } - - public void reset(ActionMapping mapping, HttpServletRequest request) { - super.reset(mapping, request); - metaProject = null; - project = null; - version = null; - shouldBeRemoved = false; - } - - public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { - // don't validate if we are preparing the form ... - if (shouldValidate(mapping, request)) { - ActionErrors errs = super.validate(mapping, request); - if (null == errs) { - errs = new ActionErrors(); - } - - // if we are not removing the action, all the fields are - // required - if (!getShouldBeRemoved()) { - if (GenericValidator.isBlankOrNull(getMetaProject())) { - String fieldName = RequestUtils.message(request, "alert.config.props.Syslog.MetaProject"); - ActionMessage err = new ActionMessage("errors.required", fieldName); - errs.add("metaProject", err); - } - - if (GenericValidator.isBlankOrNull(getProject())) { - String fieldName = RequestUtils.message(request, "alert.config.props.Syslog.Project"); - ActionMessage err = new ActionMessage("errors.required", fieldName); - errs.add("project", err); - } - - if (GenericValidator.isBlankOrNull(getVersion())) { - String fieldName = RequestUtils.message(request, "alert.config.props.Syslog.Version"); - ActionMessage err = new ActionMessage("errors.required", fieldName); - errs.add("version", err); - } - } - - return errs; - } else { - return null; - } - } -} - -// EOF diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsRolesAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsRolesAction.java deleted file mode 100644 index 0cca221..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsRolesAction.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.core.domain.alert.notification.RoleNotification; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ViewDefinitionNotificationsRolesAction extends ViewDefinitionNotificationsAction<RoleNotification> { - private Log log = LogFactory.getLog(ViewDefinitionNotificationsRolesAction.class); - - @Override - protected PageList<RoleNotification> getPageList(Subject subject, AlertDefinition alertDefinition, - PageControl pageControl) { - AlertNotificationManagerLocal alertNotificationManager = LookupUtil.getAlertNotificationManager(); - PageList<RoleNotification> notifications = alertNotificationManager.getRoleNotifications(alertDefinition - .getId(), pageControl); - - return notifications; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsUsersAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsUsersAction.java deleted file mode 100644 index 39e00de..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsUsersAction.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.core.domain.alert.notification.SubjectNotification; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -public class ViewDefinitionNotificationsUsersAction extends ViewDefinitionNotificationsAction<SubjectNotification> { - private Log log = LogFactory.getLog(ViewDefinitionNotificationsUsersAction.class); - - @Override - protected PageList<SubjectNotification> getPageList(Subject subject, AlertDefinition alertDefinition, - PageControl pageControl) { - AlertNotificationManagerLocal alertNotificationManager = LookupUtil.getAlertNotificationManager(); - PageList<SubjectNotification> notifications = alertNotificationManager.getSubjectNotifications(alertDefinition - .getId(), pageControl); - - return notifications; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionAction.java deleted file mode 100644 index 4291c80..0000000 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionAction.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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.gui.legacy.action.resource.common.monitor.alerts.config; - -import java.util.Properties; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.tiles.actions.TilesAction; - -import org.rhq.core.domain.alert.AlertDefinition; -import org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.AlertDefUtil; -import org.rhq.enterprise.server.RHQConstants; -import org.rhq.enterprise.server.util.LookupUtil; - -/** - * View an alert definition -- syslog action. - */ -public class ViewDefinitionSyslogActionAction extends TilesAction { - private Log log = LogFactory.getLog(ViewDefinitionSyslogActionAction.class.getName()); - - public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - Properties config = LookupUtil.getSystemManager().getSystemConfiguration(); - - String enabledStr = config.getProperty(RHQConstants.SyslogActionsEnabled); - Boolean syslogActionsEnabled = Boolean.valueOf(enabledStr); - request.setAttribute(RHQConstants.SyslogActionsEnabled, syslogActionsEnabled); - - if (syslogActionsEnabled) { - AlertDefinition alertDef = AlertDefUtil.getAlertDefinition(request); - SyslogActionForm saForm = new SyslogActionForm(); - //AlertDefUtil.prepareSyslogActionForm(alertDef, saForm); - request.setAttribute("syslogActionForm", saForm); - } - - return null; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml index c7466d1..8392074 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml @@ -181,15 +181,6 @@ <form-bean name="EditAlertDefinitionControlActionForm" type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ControlActionForm"/> - <form-bean name="EditAlertDefinitionSyslogActionForm" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.SyslogActionForm"/> - - <form-bean name="AddAlertUsersForm" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.AddUsersForm"/> - - <form-bean name="AddAlertRolesForm" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.AddRolesForm"/> - <form-bean name="EditMetricBaselineForm" type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.EditMetricBaselineForm"/> @@ -2578,42 +2569,6 @@ scope="request" type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ViewDefinitionControlActionAction"/> - <action path="/alerts/ViewSyslogAction" - scope="request" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ViewDefinitionSyslogActionAction"/> - - <action path="/alerts/ViewNotificationsRoles" - name="RemoveNotificationsForm" - scope="request" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ViewDefinitionNotificationsRolesAction"> - <set-property property="title" value="View+Alert+Detail"/> - </action> - - <action path="/alerts/ViewNotificationsUsers" - name="RemoveNotificationsForm" - scope="request" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ViewDefinitionNotificationsUsersAction"> - <set-property property="title" value="View+Alert+Detail"/> - </action> - - <action path="/alerts/RemoveRoles" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.RemoveRolesAction" - name="RemoveNotificationsForm" - scope="request" - input="/alerts/Config.do?mode=viewRoles"> - <forward name="success" path="/alerts/Config.do?mode=viewRoles" redirect="true"/> - <forward name="failure" path="/alerts/Config.do?mode=viewRoles" redirect="true"/> - </action> - - <action path="/alerts/RemoveUsers" - type="org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.RemoveUsersAction" - name="RemoveNotificationsForm" - scope="request" - input="/alerts/Config.do?mode=viewUsers"> - <forward name="success" path="/alerts/Config.do?mode=viewUsers" redirect="true"/> - <forward name="failure" path="/alerts/Config.do?mode=viewUsers" redirect="true"/> - </action> -  <action path="/software/ListSoftware" name="RemoveAlertsForm" diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml index 38238f5..53e1545 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml @@ -106,25 +106,11 @@ <definition name=".events.alert.view.notifications.list" path="/resource/common/monitor/alerts/ViewAlertNotificationsList.jsp"/> - <definition name=".events.alert.view.notifications.others" - path="/resource/common/monitor/alerts/ViewAlertNotificationsOthers.jsp" - controllerUrl="/alerts/ViewNotificationsOthers.do"/> - - <definition name=".events.alert.view.notifications.roles" - path="/resource/common/monitor/alerts/ViewAlertNotificationsRoles.jsp" - controllerUrl="/alerts/ViewNotificationsRoles.do"/> - - <definition name=".events.alert.view.notifications.users" - path="/resource/common/monitor/alerts/ViewAlertNotificationsUsers.jsp" - controllerUrl="/alerts/ViewNotificationsUsers.do"/> <definition name=".events.alert.view.controlaction" path="/resource/common/monitor/alerts/config/ViewDefinitionControlAction.jsp" controllerUrl="/alerts/ViewControlAction.do"/> - <definition name=".events.alert.view.syslogaction" - path="/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp" - controllerUrl="/alerts/ViewSyslogAction.do"/> <definition name=".events.alert.view" path="/resource/common/monitor/alerts/ViewAlert.jsp" @@ -216,18 +202,6 @@ <definition name=".events.config.view.notifications.tabs" path="/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp"/> - <definition name=".events.config.view.notifications.others" - path="/resource/common/monitor/alerts/config/ListOthers.jsp" - controllerUrl="/alerts/ViewNotificationsOthers.do"/> - - <definition name=".events.config.view.notifications.roles" - path="/resource/common/monitor/alerts/config/ListRoles.jsp" - controllerUrl="/alerts/ViewNotificationsRoles.do"/> - - <definition name=".events.config.view.notifications.users" - path="/resource/common/monitor/alerts/config/ListUsers.jsp" - controllerUrl="/alerts/ViewNotificationsUsers.do"/> - <definition name=".events.config.view.controlactionbox" path="/resource/common/monitor/alerts/config/ViewDefinitionControlActionBox.jsp" controllerUrl="/alerts/ViewControlAction.do"/> @@ -235,13 +209,6 @@ <definition name=".events.config.view.controlaction" path="/resource/common/monitor/alerts/config/ViewDefinitionControlAction.jsp"/> - <definition name=".events.config.view.syslogactionbox" - path="/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp" - controllerUrl="/alerts/ViewSyslogAction.do"/> - - <definition name=".events.config.view.syslogaction" - path="/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp"/> - <definition name=".events.config.view.others" path="/resource/common/monitor/alerts/config/ViewDefinition.jsp" controllerUrl="/alerts/ViewDefinition.do"/> @@ -259,18 +226,6 @@ path="/resource/common/monitor/alerts/config/ListDefinitions.jsp" controllerUrl="/alerts/ListDefinitions.do"/> - <definition name =".events.config.addusers" - controllerUrl="/events/config/AddUsersFormPrepare.do" - path="/resource/common/monitor/alerts/config/AddEventUsers.jsp"/> - - <definition name =".events.config.addroles" - controllerUrl="/events/config/AddRolesFormPrepare.do" - path="/resource/common/monitor/alerts/config/AddEventRoles.jsp"/> - - <definition name =".events.config.addothers" - controllerUrl="/events/config/AddOthersFormPrepare.do" - path="/resource/common/monitor/alerts/config/AddEventOthers.jsp"/> - <definition name=".tabs.resource.events" extends=".tabs.resource"> <putList name="tabList"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventRoles.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventRoles.jsp deleted file mode 100644 index 5fa4f6a..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventRoles.jsp +++ /dev/null @@ -1,44 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> - -<%-- if the attributes are not available, we can't display this tile: an error probably occured --%> -<c:choose> -<c:when test="${AvailableRoles == null}"> - -<tiles:insert page="/common/NoRights.jsp"/> -</c:when> -<c:otherwise> - -<html:form method="POST" action="/alerts/config/AddRoles"> - -<tiles:insert definition=".page.title.events"> - <tiles:put name="titleKey" value="alert.config.edit.AddNotifications"/> -</tiles:insert> - -<tiles:insert definition=".portlet.error"/> - -<tiles:insert page="/resource/common/monitor/alerts/config/DefinitionRolesForm.jsp"> - <tiles:put name="availableRoles" beanName="AvailableRoles"/> - <tiles:put name="numAvailableRoles" beanName="AvailableRoles" beanProperty="totalSize"/> - <tiles:put name="pendingRoles" beanName="PendingRoles"/> - <tiles:put name="numPendingRoles" beanName="PendingRoles" beanProperty="totalSize"/> -</tiles:insert> - -<tiles:insert definition=".form.buttons"> - <tiles:put name="addToList" value="true"/> -</tiles:insert> - -<tiles:insert definition=".page.footer"/> -<html:hidden property="ad"/> -<html:hidden property="id"/> -<html:hidden property="type"/> -<html:hidden property="groupId"/> - -</html:form> - -</c:otherwise> -</c:choose> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventUsers.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventUsers.jsp deleted file mode 100644 index 9f49cf9..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventUsers.jsp +++ /dev/null @@ -1,44 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> - -<%-- if the attributes are not available, we can't display this tile: an error probably occured --%> -<c:choose> -<c:when test="${AvailableUsers == null}"> - -<tiles:insert page="/common/NoRights.jsp"/> -</c:when> -<c:otherwise> - -<html:form method="POST" action="/alerts/config/AddUsers"> - -<tiles:insert definition=".page.title.events"> - <tiles:put name="titleKey" value="alert.config.edit.AddNotifications"/> -</tiles:insert> - -<tiles:insert definition=".portlet.error"/> - -<tiles:insert page="/resource/common/monitor/alerts/config/DefinitionUsersForm.jsp"> - <tiles:put name="availableUsers" beanName="AvailableUsers"/> - <tiles:put name="numAvailableUsers" beanName="AvailableUsers" beanProperty="totalSize"/> - <tiles:put name="pendingUsers" beanName="PendingUsers"/> - <tiles:put name="numPendingUsers" beanName="PendingUsers" beanProperty="totalSize"/> -</tiles:insert> - -<tiles:insert definition=".form.buttons"> - <tiles:put name="addToList" value="true"/> -</tiles:insert> - -<tiles:insert definition=".page.footer"/> -<html:hidden property="ad"/> -<html:hidden property="id"/> -<html:hidden property="type"/> -<html:hidden property="groupId"/> - -</html:form> - -</c:otherwise> -</c:choose> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListRoles.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListRoles.jsp deleted file mode 100644 index e1b5ccc..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListRoles.jsp +++ /dev/null @@ -1,27 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> -<%@ taglib uri="/WEB-INF/tld/display.tld" prefix="display" %> - -<tiles:importAttribute name="selfUrl"/> - -<%-- if the attributes are not available, we can't display this tile: an error probably occured --%> -<c:choose> -<c:when test="${null == notifyList || empty listSize}"> - -</c:when> -<c:otherwise> - -<hq:pageSize var="pageSize"/> -<display:table cellspacing="0" cellpadding="0" width="100%" action="${selfUrl}" items="${notifyList}"> - <display:column width="1%" property="id" title="<input type=\"checkbox\" onclick=\"ToggleAll(this, widgetProperties, true)\" name=\"listToggleAll\">" isLocalizedTitle="false" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox"> - <display:checkboxdecorator name="roles" onclick="ToggleSelection(this,widgetProperties, true)" styleClass="listMember"/> - </display:column> - <display:column width="20%" property="role.name" title="alert.config.props.NB.Name" href="/admin/role/RoleAdmin.do?mode=view" paramId="r" paramProperty="role.id"/> - <display:column width="79%" property="role.description" title="common.header.Description"/> -</display:table> - -</c:otherwise> -</c:choose> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListUsers.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListUsers.jsp deleted file mode 100644 index 12af63f..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListUsers.jsp +++ /dev/null @@ -1,30 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> -<%@ taglib uri="/WEB-INF/tld/display.tld" prefix="display" %> - -<tiles:importAttribute name="selfUrl"/> - -<%-- if the attributes are not available, we can't display this tile: an error probably occured --%> -<c:choose> -<c:when test="${null == notifyList || empty listSize}"> - -</c:when> -<c:otherwise> - -<hq:pageSize var="pageSize"/> -<display:table cellspacing="0" cellpadding="0" width="100%" action="${selfUrl}" items="${notifyList}"> - <display:column width="1%" property="id" title="<input type=\"checkbox\" onclick=\"ToggleAll(this, widgetProperties, true)\" name=\"listToggleAll\">" isLocalizedTitle="false" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox"> - <display:checkboxdecorator name="users" onclick="ToggleSelection(this, widgetProperties, true)" styleClass="listMember"/> - </display:column> - <display:column width="15%" property="subject.firstName" title="alert.config.props.NB.FirstName"/> - <display:column width="15%" property="subject.lastName" title="alert.config.props.NB.LastName"/> - <display:column width="20%" property="subject.name" title="alert.config.props.NB.Username" href="/admin/user/UserAdmin.do?mode=view" paramId="u" paramProperty="subject.id"/> - <display:column width="29%" property="subject.emailAddress" title="alert.config.props.NB.Email" autolink="true"/> - <display:column width="20%" property="subject.department" title="alert.config.props.NB.Dept"/> -</display:table> - -</c:otherwise> -</c:choose> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp index b8494f6..3032dee 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp @@ -22,8 +22,6 @@ <tiles:insert definition=".events.config.view.controlactionbox"/> -<tiles:insert definition=".events.config.view.syslogactionbox"/> - <tiles:insert definition=".events.config.view.nav"/> <a href="/rhq/resource/alert/notif/listAlertSender.xhtml?id=${param.id}&ad=${param.ad}">To Alert sender plugins</a> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp index f38473f..4f8688e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp @@ -6,55 +6,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> -<c:url var="viewRolesUrl" value="/alerts/Config.do"> - <c:param name="mode" value="viewRoles"/> - <c:choose> - <c:when test="${not empty Resource}"> - <c:param name="id" value="${Resource.id}"/> - </c:when> - <c:when test="${not empty ResourceGroup}"> - <c:param name="groupId" value="${ResourceGroup.id}"/> - </c:when> - <c:otherwise> - <c:param name="type" value="${ResourceType.id}"/> - </c:otherwise> - </c:choose> - <c:param name="ad" value="${alertDef.id}"/> -</c:url> - - -<c:url var="viewUsersUrl" value="/alerts/Config.do"> - <c:param name="mode" value="viewUsers"/> - <c:choose> - <c:when test="${not empty Resource}"> - <c:param name="id" value="${Resource.id}"/> - </c:when> - <c:when test="${not empty ResourceGroup}"> - <c:param name="groupId" value="${ResourceGroup.id}"/> - </c:when> - <c:otherwise> - <c:param name="type" value="${ResourceType.id}"/> - </c:otherwise> - </c:choose> - <c:param name="ad" value="${alertDef.id}"/> -</c:url> - - -<c:url var="viewOthersUrl" value="/alerts/Config.do"> - <c:param name="mode" value="viewOthers"/> - <c:choose> - <c:when test="${not empty Resource}"> - <c:param name="id" value="${Resource.id}"/> - </c:when> - <c:when test="${not empty ResourceGroup}"> - <c:param name="groupId" value="${ResourceGroup.id}"/> - </c:when> - <c:otherwise> - <c:param name="type" value="${ResourceType.id}"/> - </c:otherwise> - </c:choose> - <c:param name="ad" value="${alertDef.id}"/> -</c:url> <tiles:insert definition=".events.config.view.notifications.tabs"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp deleted file mode 100644 index 093eb87..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<c:if test="${CAM_SYSLOG_ACTIONS_ENABLED}"> -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="alert.config.props.Syslog.Title"/> -</tiles:insert> - -<table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td colspan="2" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> - </tr> - <c:choose> - <c:when test="${(! empty syslogActionForm.id) and (syslogActionForm.id > 0)}"> - <tr valign="top"> - <td width="20%" class="BlockLabel"><fmt:message key="alert.config.props.Syslog.MetaProject"/>:</td> - <td width="80%" class="BlockContent"><c:out value="${syslogActionForm.metaProject}"/></td> - </tr> - <tr valign="top"> - <td width="20%" class="BlockLabel"><fmt:message key="alert.config.props.Syslog.Project"/>:</td> - <td width="80%" class="BlockContent"><c:out value="${syslogActionForm.project}"/></td> - </tr> - <tr valign="top"> - <td width="20%" class="BlockLabel"><fmt:message key="alert.config.props.Syslog.Version"/>:</td> - <td width="80%" class="BlockContent"><c:out value="${syslogActionForm.version}"/></td> - </tr> - </c:when> - <c:otherwise> - <tr valign="top"> - <td colspan="2" class="BlockContent"><fmt:message key="alert.config.props.Syslog.NoSyslogAction"/></td> - </tr> - </c:otherwise> - </c:choose> - <tr> - <td colspan="2" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> - </tr> - <tr> - <td colspan="2" class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> - </tr> -</table> -</c:if> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp deleted file mode 100644 index 2f65aad..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<c:if test="${CAM_SYSLOG_ACTIONS_ENABLED}"> -<tiles:insert definition=".events.config.view.syslogaction"/> - -<tiles:insert definition=".toolbar.edit"> - <tiles:put name="editUrl"><c:out value="/alerts/Config.do?mode=editSyslogAction&type=${Resource.entityId.type}&rid=${Resource.id}&ad=${alertDef.id}"/></tiles:put> -</tiles:insert> -<br> -</c:if> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index 8bec831..8eee581 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -56,8 +56,6 @@ import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.domain.alert.notification.AlertNotificationLog; -import org.rhq.core.domain.alert.notification.RoleNotification; -import org.rhq.core.domain.alert.notification.SubjectNotification; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.criteria.AlertCriteria; @@ -627,34 +625,12 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { Set<String> emailAddresses = new LinkedHashSet<String>(); for (AlertNotification alertNotification : alertNotifications) { - if (alertNotification instanceof RoleNotification) { - RoleNotification roleNotification = (RoleNotification) alertNotification; - Set<Subject> subjects = roleNotification.getRole().getSubjects(); - - for (Subject subject : subjects) { - if (subject.getFsystem()) { - /* - * if a user wants to notify the superuser role, that's fine... but we shouldn't send an - * email to the special overlord user - */ - continue; - } - - String emailAddress = subject.getEmailAddress(); - - processEmailAddress(alert, emailAddress, emailAddresses); - } - } else if (alertNotification instanceof SubjectNotification) { - SubjectNotification subjectNotification = (SubjectNotification) alertNotification; - String emailAddress = subjectNotification.getSubject().getEmailAddress(); - processEmailAddress(alert, emailAddress, emailAddresses); - } - - - // Send over the new AlertSenders - if (alertNotification.getSenderName()==null) + // Send over the new AlertSender plugins + if (alertNotification.getSenderName()==null) { + log.warn("Alert notification " + alertNotification + " has no sender name defined"); continue; + } AlertSender sender = getAlertSender(alertNotification); if (sender != null) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java index 08cbe40..dfa59f3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java @@ -20,8 +20,6 @@ package org.rhq.enterprise.server.alert; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -41,17 +39,12 @@ import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertDefinitionContext; import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.domain.alert.notification.NotificationTemplate; -import org.rhq.core.domain.alert.notification.RoleNotification; -import org.rhq.core.domain.alert.notification.SubjectNotification; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.authz.Role; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.plugin.PluginKey; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PersistenceUtility; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; @@ -137,176 +130,11 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc alertDefinition.getResource().getId()); } - if (hasPermission == false) { + if (!hasPermission) { throw new PermissionException(subject + " is not authorized to edit this alert definition"); } } - public int addRoleNotifications(Subject subject, Integer alertDefinitionId, Integer[] roleIds) { - AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); - Collection<AlertNotification> notifications = alertDefinition.getAlertNotifications(); - - List<Role> roles = roleManager.findRolesByIds(roleIds, PageControl.getUnlimitedInstance()); - - int added = 0; - for (Role role : roles) { - RoleNotification notification = new RoleNotification(alertDefinition, role); - - // only increment for non-duplicate additions - if (notifications.contains(notification) == false) { - added++; - notifications.add(notification); // cascading should take care of persisting - } - } - - postProcessAlertDefinition(alertDefinition); - - return added; - } - - @SuppressWarnings("unchecked") - public PageList<RoleNotification> getRoleNotifications(Integer alertDefinitionId, PageControl pageControl) { - pageControl.initDefaultOrderingField("rn.role.name"); - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, - RoleNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, - RoleNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID, pageControl); - - queryCount.setParameter("alertDefinitionId", alertDefinitionId); - query.setParameter("alertDefinitionId", alertDefinitionId); - - long count = (Long) queryCount.getSingleResult(); - List<RoleNotification> results = query.getResultList(); - - return new PageList<RoleNotification>(results, (int) count, pageControl); - } - - @SuppressWarnings("unchecked") - public PageList<RoleNotification> getRoleNotifications(Integer[] alertNotificationIds, PageControl pageControl) { - pageControl.initDefaultOrderingField("rn.role.name"); - - if ((alertNotificationIds == null) || (alertNotificationIds.length == 0)) { - return new PageList<RoleNotification>(Collections.EMPTY_LIST, 0, pageControl); - } - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, RoleNotification.QUERY_FIND_BY_IDS); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, RoleNotification.QUERY_FIND_BY_IDS, - pageControl); - - queryCount.setParameter("ids", alertNotificationIds); - query.setParameter("ids", alertNotificationIds); - - long count = (Long) queryCount.getSingleResult(); - List<RoleNotification> results = query.getResultList(); - - return new PageList<RoleNotification>(results, (int) count, pageControl); - } - - @SuppressWarnings("unchecked") - public PageList<RoleNotification> getRoleNotificationsByRoles(Integer[] roleIds, PageControl pageControl) { - pageControl.initDefaultOrderingField("rn.role.name"); - - if ((roleIds == null) || (roleIds.length == 0)) { - return new PageList<RoleNotification>(Collections.EMPTY_LIST, 0, pageControl); - } - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, RoleNotification.QUERY_FIND_BY_ROLE_IDS); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, RoleNotification.QUERY_FIND_BY_ROLE_IDS, - pageControl); - - queryCount.setParameter("ids", roleIds); - query.setParameter("ids", roleIds); - - long count = (Long) queryCount.getSingleResult(); - List<RoleNotification> results = query.getResultList(); - - return new PageList<RoleNotification>(results, (int) count, pageControl); - } - - public int addSubjectNotifications(Subject user, Integer alertDefinitionId, Integer[] subjectIds) { - AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); - Collection<AlertNotification> notifications = alertDefinition.getAlertNotifications(); - - List<Subject> subjects = subjectManager.findSubjectsById(subjectIds, PageControl.getUnlimitedInstance()); - - int added = 0; - for (Subject subject : subjects) { - SubjectNotification notification = new SubjectNotification(alertDefinition, subject); - - // only increment for non-duplicate additions - if (notifications.contains(notification) == false) { - added++; - notifications.add(notification); // cascading should take care of persisting - } - } - - postProcessAlertDefinition(alertDefinition); - - return added; - } - - @SuppressWarnings("unchecked") - public PageList<SubjectNotification> getSubjectNotifications(Integer alertDefinitionId, PageControl pageControl) { - pageControl.initDefaultOrderingField("sn.subject.name"); - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, - SubjectNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, - SubjectNotification.QUERY_FIND_ALL_BY_ALERT_DEFINITION_ID, pageControl); - - queryCount.setParameter("alertDefinitionId", alertDefinitionId); - query.setParameter("alertDefinitionId", alertDefinitionId); - - long count = (Long) queryCount.getSingleResult(); - List<SubjectNotification> results = query.getResultList(); - - return new PageList<SubjectNotification>(results, (int) count, pageControl); - } - - - @SuppressWarnings("unchecked") - public PageList<SubjectNotification> getSubjectNotifications(Integer[] alertNotificationIds, PageControl pageControl) { - pageControl.initDefaultOrderingField("sn.subject.name"); - - if ((alertNotificationIds == null) || (alertNotificationIds.length == 0)) { - return new PageList<SubjectNotification>(Collections.EMPTY_LIST, 0, pageControl); - } - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, SubjectNotification.QUERY_FIND_BY_IDS); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, SubjectNotification.QUERY_FIND_BY_IDS, - pageControl); - - queryCount.setParameter("ids", alertNotificationIds); - query.setParameter("ids", alertNotificationIds); - - long count = (Long) queryCount.getSingleResult(); - List<SubjectNotification> results = query.getResultList(); - - return new PageList<SubjectNotification>(results, (int) count, pageControl); - } - - @SuppressWarnings("unchecked") - public PageList<SubjectNotification> getSubjectNotificationsBySubjects(Integer[] subjectIds, PageControl pageControl) { - pageControl.initDefaultOrderingField("rn.role.name"); - - if ((subjectIds == null) || (subjectIds.length == 0)) { - return new PageList<SubjectNotification>(Collections.EMPTY_LIST, 0, pageControl); - } - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, - SubjectNotification.QUERY_FIND_BY_SUBJECT_IDS); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, - SubjectNotification.QUERY_FIND_BY_SUBJECT_IDS, pageControl); - - queryCount.setParameter("ids", subjectIds); - query.setParameter("ids", subjectIds); - - long count = (Long) queryCount.getSingleResult(); - List<SubjectNotification> results = query.getResultList(); - - return new PageList<SubjectNotification>(results, (int) count, pageControl); - } public int removeNotifications(Subject subject, Integer alertDefinitionId, Integer[] notificationIds) { AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java index 754bb63..2408723 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java @@ -25,13 +25,9 @@ import javax.ejb.Local; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.domain.alert.notification.NotificationTemplate; -import org.rhq.core.domain.alert.notification.RoleNotification; -import org.rhq.core.domain.alert.notification.SubjectNotification; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderInfo; import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean; @@ -43,23 +39,6 @@ import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean; @Local public interface AlertNotificationManagerLocal { - int addRoleNotifications(Subject subject, Integer alertDefinitionId, Integer[] roleIds); - - int addSubjectNotifications(Subject subject, Integer alertDefinitionId, Integer[] subjectId); - - - PageList<RoleNotification> getRoleNotifications(Integer alertDefinitionId, PageControl pageControl); - - PageList<SubjectNotification> getSubjectNotifications(Integer alertDefinitionId, PageControl pageControl); - - PageList<RoleNotification> getRoleNotifications(Integer[] alertNotificationIds, PageControl pageControl); - - PageList<SubjectNotification> getSubjectNotifications(Integer[] alertNotificationIds, PageControl pageControl); - - PageList<RoleNotification> getRoleNotificationsByRoles(Integer[] roleIds, PageControl pageControl); - - PageList<SubjectNotification> getSubjectNotificationsBySubjects(Integer[] subjectId, PageControl pageControl); - /** * Remove the passed notifications from the passed alert definition (all identified by their id) * @param subject Caller diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java index fd25d9b..dbe792f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java @@ -478,11 +478,6 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe throw new PermissionException("You cannot remove yourself: " + doomedSubject.getName()); } - Query deleteNotificationQuery = entityManager - .createQuery("DELETE FROM SubjectNotification sn WHERE sn.subject.id = :subjectId"); - deleteNotificationQuery.setParameter("subjectId", doomedSubjectId); - deleteNotificationQuery.executeUpdate(); // discard result, might not have been set for any notifications - Set<Role> roles = doomedSubject.getRoles(); doomedSubject.setRoles(new HashSet<Role>()); // clean out roles @@ -585,42 +580,6 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe } } - @SuppressWarnings("unchecked") - public PageList<Subject> findAvailableSubjectsForAlertDefinition(Subject whoami, Integer alertDefinitionId, - Integer[] pendingSubjectIds, PageControl pc) { - pc.initDefaultOrderingField("s.name"); - - String queryName; - - if ((pendingSubjectIds == null) || (pendingSubjectIds.length == 0)) { - queryName = Subject.QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION; - } else { - queryName = Subject.QUERY_FIND_AVAILABLE_SUBJECTS_FOR_ALERT_DEFINITION_WITH_EXCLUDES; - } - - Query countQuery = PersistenceUtility.createCountQuery(entityManager, queryName, "distinct s"); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, queryName, pc); - - countQuery.setParameter("alertDefinitionId", alertDefinitionId); - query.setParameter("alertDefinitionId", alertDefinitionId); - - if ((pendingSubjectIds != null) && (pendingSubjectIds.length > 0)) { - List<Integer> pendingIdsList = Arrays.asList(pendingSubjectIds); - countQuery.setParameter("excludes", pendingIdsList); - query.setParameter("excludes", pendingIdsList); - } - - long count = (Long) countQuery.getSingleResult(); - List<Subject> subjects = query.getResultList(); - - // eagerly load in the roles - can't use left-join due to PersistenceUtility usage; perhaps use EAGER - for (Subject subject : subjects) { - subject.getRoles().size(); - } - - return new PageList<Subject>(subjects, (int) count, pc); - } - @RequiredPermission(Permission.MANAGE_SECURITY) @SuppressWarnings("unchecked") public PageList<Subject> findAvailableSubjectsForRole(Subject whoami, Integer roleId, Integer[] pendingSubjectIds, diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java index e4d2611..e3f8ded 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java @@ -176,23 +176,6 @@ public interface SubjectManagerLocal { PageList<Subject> findAvailableSubjectsForRole(Subject whoami, Integer roleId, Integer[] pendingSubjectIds, PageControl pc); - /** - * This returns a list of subjects that are available to be assigned to a given alert definition but not yet - * assigned to that alert definition. This excludes subjects already assigned to the alert definition. The returned - * list will not include the subjects identified by <code>pendingSubjectIds</code> since it is assumed the pending - * subjects will be assigned to the alert definition. - * - * @param whoami user attempting to make this call - * @param alertDefinitionId the alert definition whose list of available subjects are to be returned - * @param pendingSubjectIds the list of subjects that are planned to be given to the alert definition - * @param pc - * - * @return the list of subjects that can be assigned to the given alert definition, not including the pending - * subjects - */ - PageList<Subject> findAvailableSubjectsForAlertDefinition(Subject whoami, Integer alertDefinitionId, - Integer[] pendingSubjectIds, PageControl pc); - void logout(int sessionId); Subject getSubjectById(int id); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java index 3478499..8762845 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java @@ -133,11 +133,6 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { for (Integer roleId : doomedRoleIds) { Role doomedRole = entityManager.find(Role.class, roleId); - Query deleteNotificationQuery = entityManager - .createQuery("DELETE FROM RoleNotification rn WHERE rn.role.id = :roleId"); - deleteNotificationQuery.setParameter("roleId", roleId); - deleteNotificationQuery.executeUpdate(); // discard result, might not have been set for any notifications - Set<Subject> subjectsToUnhook = new HashSet<Subject>(doomedRole.getSubjects()); // avoid concurrent mod exception for (Subject doomedSubjectRelationship : subjectsToUnhook) { doomedRole.removeSubject(doomedSubjectRelationship); @@ -388,42 +383,6 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { return findAvailableRolesForSubject(subject, subjectId, null, pc); } - @SuppressWarnings("unchecked") - public PageList<Role> findAvailableRolesForAlertDefinition(Subject subject, Integer alertDefinitionId, - Integer[] pendingRoleIds, PageControl pc) { - pc.initDefaultOrderingField("r.name"); - - String queryName; - - if ((pendingRoleIds == null) || (pendingRoleIds.length == 0)) { - queryName = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION; - } else { - queryName = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION_WITH_EXCLUDES; - } - - Query queryCount = PersistenceUtility.createCountQuery(entityManager, queryName, "distinct r"); - Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, queryName, pc); - - queryCount.setParameter("alertDefinitionId", alertDefinitionId); - query.setParameter("alertDefinitionId", alertDefinitionId); - - if ((pendingRoleIds != null) && (pendingRoleIds.length > 0)) { - List<Integer> pendingidslist = Arrays.asList(pendingRoleIds); - queryCount.setParameter("excludes", pendingidslist); - query.setParameter("excludes", pendingidslist); - } - - long count = (Long) queryCount.getSingleResult(); - List<Role> roles = query.getResultList(); - - // eagerly load in the members - can't use left-join due to PersistenceUtility usage; perhaps use EAGER - for (Role role : roles) { - role.getMemberCount(); - } - - return new PageList<Role>(roles, (int) count, pc); - } - /** * @see org.rhq.enterprise.server.authz.RoleManagerLocal#addResourceGroupsToRole(Subject, int, int[]) */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java index e3f1137..58f962a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java @@ -140,22 +140,6 @@ public interface RoleManagerLocal { PageList<Role> findAvailableRolesForSubject(Subject subject, Integer subjectId, Integer[] pendingRoleIds, PageControl pc); - /** - * This returns a list of roles that are available to be assigned to a given alert definition but not yet assigned - * to that alert definition. This excludes roles already assigned to the alert definition. The returned list will - * not include the roles identified by <code>pendingRoleIds</code> since it is assumed the pending roles will be - * assigned to the alert definition. - * - * @param subject user attempting to make this call - * @param alertDefinitionId the alert definition whose list of available roles are to be returned - * @param pendingRoleIds the list of roles that are planned to be given to the alert definition - * @param pc - * - * @return the list of roles that can be assigned to the given alert definition, not including the pending roles - */ - PageList<Role> findAvailableRolesForAlertDefinition(Subject subject, Integer alertDefinitionId, - Integer[] pendingRoleIds, PageControl pc); - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // // The following are shared with the Remote Interface @@ -177,7 +161,7 @@ public interface RoleManagerLocal { PageList<Role> findSubjectAssignedRoles(Subject subject, int subjectId, PageControl pc); - //This is a proxy of getAvailableRolesForSubject but without pendingRoleIds as required by remote spec + //This is a proxy of getAvailableRolesForSubject but without pendingRoleIds as required by remote spec PageList<Role> findSubjectUnassignedRoles(Subject subject, int subjectId, PageControl pc); /**

1 0

[rhq] Branch 'content' - 9 commits - .classpath modules/enterprise .settings/org.eclipse.jdt.ui.prefs
by jdob 03 Feb '10

03 Feb '10

.classpath | 2 .settings/org.eclipse.jdt.ui.prefs | 4 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115 ++++++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 70 ++---- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 91 ------- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 14 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 90 +++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73 ++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 7 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 7 13 files changed, 511 insertions(+), 143 deletions(-) New commits: commit 9556c7d579d83d84d1cc2ffd6af210b18603dea8 Merge: ae1b4ae... e01ac13... Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Wed Feb 3 08:23:56 2010 -0500 Merge branch 'master' into content commit e01ac1302020282dfa2f0583c30ff859089143ea Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 02:56:02 2010 -0500 refactor the jline integration to fix problems and enhance it. this commit will allow the user to select the implementation to use; you can now use the command line option --console (-e) to say if you want the console input to be read by "java" (pure Java implementation), "sigar" (this was the original native console way we had before) or "jline" (which is the new native console way). This allows a user to select a non-native way to read input in case they are running on a platform that doesn't support the native library (jline's native lib or sigar's native lib) or in case the native library has a bug and is causing the agent to crash. If you use "sigar", and you disable the native system API (native --disable), this will cause the console to fallback to the "java" console impl. If user is using "jline", there is no fallback to - if jline is giving problems, you must exit the agent, and specify a --console argument to override the console to use. The default is "jline". diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java index dc6644b..4f00ab1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -28,24 +28,32 @@ import java.io.IOException; */ public interface AgentInputReader { /** + * Indicates if the input is coming from a console (i.e. keyboard) or if its coming from + * a file. + * + * @return <code>true</code> if console is the source of the input; <code>false</code> if file is the source + */ + boolean isConsole(); + + /** * Reads a line from the input console. * * @return the line * @throws IOException */ String readLine() throws IOException; - + /** - * Reads a line from the input console, echoing out the 'mask' character as opposed to the character - * typed by the user. If the console implementation does not support mask echoes, either the - * user-entered character is masked or some other masking is performed in an implementation specific way. + * Read a line of input, but do not echo back to the user what is being typed. This is used mainly when asking for + * things like passwords. + * If the console implementation does not support no-echo input, the input will be + * output as the user typed it. * - * @param mask character to echo back to the user when the user types in the line. * @return the line typed by the user * @throws IOException */ - String readLine(char mask) throws IOException; - + String readLineNoEcho() throws IOException; + /** * Close the reader. * @throws IOException diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java index e3ebe4c..71f0e4f 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -18,19 +18,98 @@ */ package org.rhq.enterprise.agent; +import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; +import mazz.i18n.Logger; + +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + /** * Creates implementations of the input reader depending on the need for a native console library. * * @author John Mazzitelli */ public class AgentInputReaderFactory { - public static AgentInputReader create() throws IOException { - return new JlineAgentInputReader(); + private static final Logger LOG = AgentI18NFactory.getLogger(AgentInputReaderFactory.class); + + public static enum ConsoleType { + java, sigar, jline + } + + private static ConsoleType consoleType = ConsoleType.jline; + + public static AgentInputReader create(AgentMain agent) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(); + break; + case sigar: + input = new SigarAgentInputReader(agent); + break; + case jline: + input = new JLineAgentInputReader(agent); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(); + } + + return input; } - public static AgentInputReader create(FileInputStream fis) throws IOException { - return new JlineAgentInputReader(fis); + + public static AgentInputReader create(AgentMain agent, File file) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(new FileReader(file)); + break; + case sigar: + input = new SigarAgentInputReader(agent, new FileReader(file)); + break; + case jline: + input = new JLineAgentInputReader(agent, new FileInputStream(file)); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(new FileReader(file)); + } + + return input; + } + + public static ConsoleType getConsoleType() { + return consoleType; + } + + public static void setConsoleType(ConsoleType type) { + consoleType = type; + } + + public static void setConsoleType(String typeStr) { + try { + setConsoleType(ConsoleType.valueOf(typeStr)); + } catch (Exception e) { + throw new IllegalArgumentException(LOG.getMsgString( + AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_BAD_TYPE, typeStr)); + } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index aba4eb5..2baf5f5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -89,7 +89,6 @@ import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; import org.rhq.core.util.exception.ThrowableUtil; @@ -152,7 +151,6 @@ import org.rhq.enterprise.communications.command.server.CommandListener; import org.rhq.enterprise.communications.command.server.IncomingCommandTrace; import org.rhq.enterprise.communications.util.CommandTraceUtil; import org.rhq.enterprise.communications.util.SecurityUtil; -import org.rhq.enterprise.communications.util.prefs.PromptInput; /** * The main class of the agent runtime container. @@ -387,12 +385,13 @@ public class AgentMain { if (agent.m_forcedSetup || (!agent.m_daemonMode && !agent.m_configuration.isAgentConfigurationSetup())) { SetupPromptCommand setup_cmd = new SetupPromptCommand(); + AgentPromptInfo in = new AgentPromptInfo(agent); + AgentPrintWriter out = agent.getOut(); + Preferences prefs = agent.m_configuration.getPreferences(); if (agent.m_advancedSetup) { - setup_cmd.performAdvancedSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), - agent.getOut()); + setup_cmd.performAdvancedSetup(prefs, in, out); } else { - setup_cmd.performBasicSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), agent - .getOut()); + setup_cmd.performBasicSetup(prefs, in, out); } } @@ -459,7 +458,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = AgentInputReaderFactory.create(); + m_input = null; m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -477,6 +476,9 @@ public class AgentMain { m_commandLineArgs = args; processArguments(m_commandLineArgs); + if (m_input == null) { + m_input = AgentInputReaderFactory.create(this); + } m_promptCommands = new HashMap<String, Class<? extends AgentPromptCommand>>(); setupPromptCommandsMap(m_promptCommands); @@ -805,32 +807,6 @@ public class AgentMain { } /** - * In some cases, we want to read console input in a native way (that is, using the native system to read the - * keyboard input). This is mainly useful when you want to read in prompt answers which include passwords and you do - * not want to echo what the user typed. - * - * @return object that can be used to read input with the typed data being echoed or not - */ - public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); - } - - /** * Returns the object that can be used to obtain I18N messages from the agent's resource bundle in the user's * locale. * @@ -1097,10 +1073,10 @@ public class AgentMain { // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = AgentInputReaderFactory.create(); + m_input = AgentInputReaderFactory.create(this); } catch (IOException e1) { m_input = null; - } + } m_stdinInput = true; input_string = ""; } else { @@ -2691,12 +2667,13 @@ public class AgentMain { * @throws HelpException if help was requested and the agent should not be created */ private void processArguments(String[] args) throws Exception { - String sopts = "-:hdlasntuD:i:o:c:p:"; + String sopts = "-:hdlasntuD:i:o:c:p:e:"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'), new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), new LongOpt("config", LongOpt.REQUIRED_ARGUMENT, null, 'c'), new LongOpt("pref", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), @@ -2789,6 +2766,11 @@ public class AgentMain { break; } + case 'e': { + AgentInputReaderFactory.setConsoleType(getopt.getOptarg()); + break; + } + case 'd': { m_daemonMode = true; break; @@ -2798,7 +2780,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = AgentInputReaderFactory.create(new FileInputStream(script)); + m_input = AgentInputReaderFactory.create(this, script); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java deleted file mode 100644 index 287421d..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note - * that if the native libraries are not available or have been disabled, this will effectively fallback to using the - * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} - * will do the same as {@link #readLine()}). - * - * @author John Mazzitelli - */ -public class AgentNativePromptInfo implements PromptInput { - private final SystemInfo systemInfo; - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the system info used to obtain the console input - * natively. The agent is provided so it can give us a fallback stream where input can be read in case either <code> - * sysinfo</code> is <code>null</code> or it is not a native implementation (as will be the case if the platform - * where this object is running does not have native libraries for it). - * - * @param sysinfo the object where native console input can be read (may be <code>null</code>) - * @param agent the agent that will be doing the prompting and will provide us with a fallback input stream if - * <code>sysinfo</code> is <code>null</code> or not a native implementation - */ - public AgentNativePromptInfo(SystemInfo sysinfo, AgentMain agent) { - this.systemInfo = sysinfo; - this.agent = agent; - } - - public String readLine() throws IOException { - String input; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - input = systemInfo.readLineFromConsole(false); - } - - return input; - } - - public String readLineNoEcho() throws IOException { - String input = null; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - while (true) { - // get the answer the first time - input = systemInfo.readLineFromConsole(true); - - // get the answer a second time - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - String confirmation = systemInfo.readLineFromConsole(true); - systemInfo.writeLineToConsole("\n"); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - } - } - - return input; - } -} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java new file mode 100644 index 0000000..9984626 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note + * that if the native libraries are not available or have been disabled, this will effectively fallback to using the + * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} + * will do the same as {@link #readLine()}). + * + * @author John Mazzitelli + */ +public class AgentPromptInfo implements PromptInput { + + private final AgentMain agent; + + public AgentPromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLine(); + } else { + throw new IOException("Agent not accepting input"); + } + } + + public String readLineNoEcho() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLineNoEcho(); + } else { + throw new IOException("Agent not accepting input"); + } + } +} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java index 4d691c2..70e8e84 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java @@ -174,7 +174,19 @@ public class AgentUpdateThread extends Thread { if (results.getError() != null) { throw results.getError(); } - tryAgain = false; + + // update has started! if this agent is running in non-daemon mode, kill + // the input stream so the input thread knows to shutdown now + try { + AgentInputReader in = this.agent.getIn(); + if (in != null) { + System.in.close(); // we must ensure we close this directly! + in.close(); + } + } catch (Throwable t) { + } finally { + tryAgain = false; + } } catch (Throwable t) { showErrorMessage(AgentI18NResourceKeys.UPDATE_THREAD_EXCEPTION, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java new file mode 100644 index 0000000..15a3a89 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java @@ -0,0 +1,90 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +import jline.ConsoleReader; + +public class JLineAgentInputReader implements AgentInputReader { + + private final ConsoleReader jline; + private final AgentMain agent; + private final boolean consoleInput; + + public JLineAgentInputReader(AgentMain agent) throws IOException { + this.jline = new ConsoleReader(); + this.agent = agent; + this.consoleInput = true; + } + + public JLineAgentInputReader(AgentMain agent, FileInputStream fis) throws IOException { + this.jline = new ConsoleReader(fis, agent.getOut()); + this.agent = agent; + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.jline.readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time - the '*' is echoed back to the user + input = jline.readLine(Character.valueOf('*')); + + if (!isConsole()) { + break; // not reading input from a console, so we don't ask for confirmation + } + + // get the answer a second time + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + this.agent.getOut().println(); + String confirmation = jline.readLine(Character.valueOf('*')); + this.agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + this.agent.getOut().println(); + } + + return input; + } + + public void close() throws IOException { + InputStream input = jline.getInput(); + if (input != null) { + input.close(); + } + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java new file mode 100644 index 0000000..7003457 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java @@ -0,0 +1,60 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import jline.ConsoleReader; + +public class JavaAgentInputReader implements AgentInputReader { + + private final BufferedReader reader; + private final boolean consoleInput; + + public JavaAgentInputReader() throws IOException { + this.reader = new BufferedReader(new InputStreamReader(System.in)); + this.consoleInput = true; + } + + public JavaAgentInputReader(FileReader fr) throws IOException { + this.reader = new BufferedReader(fr); + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.reader.readLine(); + } + + public String readLineNoEcho() throws IOException { + return this.reader.readLine(); // can't mask the input with this Java API + } + + public void close() throws IOException { + this.reader.close(); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java deleted file mode 100644 index 3de70f4..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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; - -import java.io.FileInputStream; -import java.io.IOException; - -import jline.ConsoleReader; - -public class JlineAgentInputReader implements AgentInputReader { - - private ConsoleReader jline; - - public JlineAgentInputReader() throws IOException { - jline = new ConsoleReader(); - } - - public JlineAgentInputReader(FileInputStream fis) throws IOException { - jline = new ConsoleReader(fis, null); - } - - public String readLine() throws IOException { - return jline.readLine(); - } - - public String readLine(char mask) throws IOException { - return jline.readLine(Character.valueOf(mask)); - } - - public void close() throws IOException { - jline.getInput().close(); - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java new file mode 100644 index 0000000..f3b29ce --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java @@ -0,0 +1,73 @@ +package org.rhq.enterprise.agent; + +import java.io.FileReader; +import java.io.IOException; + +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Uses the SIGAR API when appropriate to read in console input. + * This falls back to the Java-only superclass implementation if + * the native SIGAR API is not available. + * + * @author John Mazzitelli + */ +public class SigarAgentInputReader extends JavaAgentInputReader { + + private final AgentMain agent; + + public SigarAgentInputReader(AgentMain agent) throws IOException { + super(); + this.agent = agent; + } + + public SigarAgentInputReader(AgentMain agent, FileReader fr) throws IOException { + super(fr); + this.agent = agent; + } + + @Override + public String readLine() throws IOException { + String input; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + input = systemInfo.readLineFromConsole(false); + } + + return input; + } + + @Override + public String readLineNoEcho() throws IOException { + String input = null; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + while (true) { + // get the answer the first time + input = systemInfo.readLineFromConsole(true); + + // get the answer a second time + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + String confirmation = systemInfo.readLineFromConsole(true); + systemInfo.writeLineToConsole("\n"); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + } + } + + return input; + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d2aa065..68da9a6 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,6 +28,12 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { + @I18NMessage("Specified bad console type [{0}]") + String AGENT_INPUT_READER_FACTORY_BAD_TYPE = "AgentMain.input-reader-factory-bad-type"; + + @I18NMessage("Failed to create console input reader of type [{0}]") + String AGENT_INPUT_READER_FACTORY_ERROR = "AgentMain.input-reader-factory-error"; + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -549,6 +555,7 @@ public interface AgentI18NResourceKeys { + "\\ -c, --config=<filename> Specifies an agent configuration preferences file (on filesystem or classpath)\\n\\\n" + "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n" + "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n" + + "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n" + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java index 57add17..4c9226a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java @@ -31,6 +31,7 @@ import org.jboss.remoting.security.SSLSocketBuilder; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.AgentPromptInfo; import org.rhq.enterprise.agent.i18n.AgentI18NFactory; import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; import org.rhq.enterprise.agent.i18n.AgentSetupInstructions; @@ -78,11 +79,11 @@ public class SetupPromptCommand implements AgentPromptCommand { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.SETUP_MUST_BE_STOPPED)); } else { if (args.length == 1) { - performBasicSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performBasicSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ADVANCED))) { - performAdvancedSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAdvancedSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ALL))) { - performAllSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAllSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); } commit 1f3d5356a7d1257f86effa4e3f83b604d9bed87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 23:44:13 2010 -0500 start abstracting out the input reader diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java new file mode 100644 index 0000000..dc6644b --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -0,0 +1,54 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.IOException; + +/** + * Abstracts out the console input to allow us to use either a native console or a Java based console. + * + * @author John Mazzitelli + */ +public interface AgentInputReader { + /** + * Reads a line from the input console. + * + * @return the line + * @throws IOException + */ + String readLine() throws IOException; + + /** + * Reads a line from the input console, echoing out the 'mask' character as opposed to the character + * typed by the user. If the console implementation does not support mask echoes, either the + * user-entered character is masked or some other masking is performed in an implementation specific way. + * + * @param mask character to echo back to the user when the user types in the line. + * @return the line typed by the user + * @throws IOException + */ + String readLine(char mask) throws IOException; + + /** + * Close the reader. + * @throws IOException + */ + void close() throws IOException; +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java new file mode 100644 index 0000000..e3ebe4c --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +/** + * Creates implementations of the input reader depending on the need for a native console library. + * + * @author John Mazzitelli + */ +public class AgentInputReaderFactory { + public static AgentInputReader create() throws IOException { + return new JlineAgentInputReader(); + } + public static AgentInputReader create(FileInputStream fis) throws IOException { + return new JlineAgentInputReader(fis); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index d75cb7d..aba4eb5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -21,14 +21,12 @@ package org.rhq.enterprise.agent; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; @@ -58,8 +56,6 @@ import java.util.prefs.Preferences; import javax.management.MBeanServer; import javax.management.ObjectName; -import jline.ConsoleReader; - import mazz.i18n.Logger; import mazz.i18n.Msg; @@ -208,7 +204,7 @@ public class AgentMain { /** * The stream where the commands are input. */ - private ConsoleReader m_input; + private AgentInputReader m_input; /** * Will be <code>true</code> if the input is coming directly from stdin; <code>false</code> if an input script file @@ -463,7 +459,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -804,7 +800,7 @@ public class AgentMain { * * @return the input stream or <code>null</code> if the agent is not currently accepting input */ - public ConsoleReader getIn() { + public AgentInputReader getIn() { return m_input; } @@ -1093,13 +1089,17 @@ public class AgentMain { } } else if (!m_stdinInput) { // if we are processing a script, we hit the EOF, so close the input stream - + try { + m_input.close(); + } catch (IOException e1) { + } // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); } catch (IOException e1) { + m_input = null; } m_stdinInput = true; input_string = ""; @@ -2798,7 +2798,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = new ConsoleReader(new FileInputStream(script), null); + m_input = AgentInputReaderFactory.create(new FileInputStream(script)); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java new file mode 100644 index 0000000..3de70f4 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +import jline.ConsoleReader; + +public class JlineAgentInputReader implements AgentInputReader { + + private ConsoleReader jline; + + public JlineAgentInputReader() throws IOException { + jline = new ConsoleReader(); + } + + public JlineAgentInputReader(FileInputStream fis) throws IOException { + jline = new ConsoleReader(fis, null); + } + + public String readLine() throws IOException { + return jline.readLine(); + } + + public String readLine(char mask) throws IOException { + return jline.readLine(Character.valueOf(mask)); + } + + public void close() throws IOException { + jline.getInput().close(); + } +} commit bd631f0dda01d2f6e594fe1c1f2df92155f4c893 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Feb 2 22:55:14 2010 -0500 fix eclipse settings so that code gets auto-reformatted on save diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 10d36a9..e7120a1 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Jan 14 12:59:22 EST 2010 +#Tue Feb 02 22:50:09 EST 2010 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true cleanup_profile=_RHQ cleanup_settings_version=2 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_RHQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e commit 95511f633370a76ab42b2b4b8eabe4259fff3903 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:36 2010 -0500 put this back in the agent diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 10a1c32a5aee2174b29a02eb70cf3a05b9a1f724 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:20 2010 -0500 opps. this should not be here diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} commit 86270a451083b341baa3710355c9ae4c02292a89 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:14:33 2010 -0500 put this back, but don't integrate it yet diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 80bf4075b6d4c3a84e1b9c788730faa191769657 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:26:27 2010 -0500 fixing .classpath (again) diff --git a/.classpath b/.classpath index 9658f94..3b948dd 100644 --- a/.classpath +++ b/.classpath @@ -112,7 +112,6 @@ <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/virt/src/test/java"/> <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> commit 1b160377f367eda9254a2bf73d1ec0ec89e5b85c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:09:57 2010 -0500 why does antlr-config keep showing up in .classpath? diff --git a/.classpath b/.classpath index ae63f80..9658f94 100644 --- a/.classpath +++ b/.classpath @@ -121,7 +121,6 @@ <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/antlr-config/src/main/antlr3"/> <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/>

1 0

[rhq] Branch 'bundle' - 9 commits - modules/enterprise .settings/org.eclipse.jdt.ui.prefs
by mazz 03 Feb '10

03 Feb '10

.settings/org.eclipse.jdt.ui.prefs | 4 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115 ++++++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 70 ++---- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 91 ------- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 14 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 90 +++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73 ++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 7 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 7 12 files changed, 511 insertions(+), 141 deletions(-) New commits: commit 7c1165c84b54f81c02532a7cb68ce20eb1025404 Merge: 5f4312d... e01ac13... Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 03:06:03 2010 -0500 Merge branch 'master' into bundle commit e01ac1302020282dfa2f0583c30ff859089143ea Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 02:56:02 2010 -0500 refactor the jline integration to fix problems and enhance it. this commit will allow the user to select the implementation to use; you can now use the command line option --console (-e) to say if you want the console input to be read by "java" (pure Java implementation), "sigar" (this was the original native console way we had before) or "jline" (which is the new native console way). This allows a user to select a non-native way to read input in case they are running on a platform that doesn't support the native library (jline's native lib or sigar's native lib) or in case the native library has a bug and is causing the agent to crash. If you use "sigar", and you disable the native system API (native --disable), this will cause the console to fallback to the "java" console impl. If user is using "jline", there is no fallback to - if jline is giving problems, you must exit the agent, and specify a --console argument to override the console to use. The default is "jline". diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java index dc6644b..4f00ab1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -28,24 +28,32 @@ import java.io.IOException; */ public interface AgentInputReader { /** + * Indicates if the input is coming from a console (i.e. keyboard) or if its coming from + * a file. + * + * @return <code>true</code> if console is the source of the input; <code>false</code> if file is the source + */ + boolean isConsole(); + + /** * Reads a line from the input console. * * @return the line * @throws IOException */ String readLine() throws IOException; - + /** - * Reads a line from the input console, echoing out the 'mask' character as opposed to the character - * typed by the user. If the console implementation does not support mask echoes, either the - * user-entered character is masked or some other masking is performed in an implementation specific way. + * Read a line of input, but do not echo back to the user what is being typed. This is used mainly when asking for + * things like passwords. + * If the console implementation does not support no-echo input, the input will be + * output as the user typed it. * - * @param mask character to echo back to the user when the user types in the line. * @return the line typed by the user * @throws IOException */ - String readLine(char mask) throws IOException; - + String readLineNoEcho() throws IOException; + /** * Close the reader. * @throws IOException diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java index e3ebe4c..71f0e4f 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -18,19 +18,98 @@ */ package org.rhq.enterprise.agent; +import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; +import mazz.i18n.Logger; + +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + /** * Creates implementations of the input reader depending on the need for a native console library. * * @author John Mazzitelli */ public class AgentInputReaderFactory { - public static AgentInputReader create() throws IOException { - return new JlineAgentInputReader(); + private static final Logger LOG = AgentI18NFactory.getLogger(AgentInputReaderFactory.class); + + public static enum ConsoleType { + java, sigar, jline + } + + private static ConsoleType consoleType = ConsoleType.jline; + + public static AgentInputReader create(AgentMain agent) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(); + break; + case sigar: + input = new SigarAgentInputReader(agent); + break; + case jline: + input = new JLineAgentInputReader(agent); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(); + } + + return input; } - public static AgentInputReader create(FileInputStream fis) throws IOException { - return new JlineAgentInputReader(fis); + + public static AgentInputReader create(AgentMain agent, File file) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(new FileReader(file)); + break; + case sigar: + input = new SigarAgentInputReader(agent, new FileReader(file)); + break; + case jline: + input = new JLineAgentInputReader(agent, new FileInputStream(file)); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(new FileReader(file)); + } + + return input; + } + + public static ConsoleType getConsoleType() { + return consoleType; + } + + public static void setConsoleType(ConsoleType type) { + consoleType = type; + } + + public static void setConsoleType(String typeStr) { + try { + setConsoleType(ConsoleType.valueOf(typeStr)); + } catch (Exception e) { + throw new IllegalArgumentException(LOG.getMsgString( + AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_BAD_TYPE, typeStr)); + } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index aba4eb5..2baf5f5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -89,7 +89,6 @@ import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; import org.rhq.core.util.exception.ThrowableUtil; @@ -152,7 +151,6 @@ import org.rhq.enterprise.communications.command.server.CommandListener; import org.rhq.enterprise.communications.command.server.IncomingCommandTrace; import org.rhq.enterprise.communications.util.CommandTraceUtil; import org.rhq.enterprise.communications.util.SecurityUtil; -import org.rhq.enterprise.communications.util.prefs.PromptInput; /** * The main class of the agent runtime container. @@ -387,12 +385,13 @@ public class AgentMain { if (agent.m_forcedSetup || (!agent.m_daemonMode && !agent.m_configuration.isAgentConfigurationSetup())) { SetupPromptCommand setup_cmd = new SetupPromptCommand(); + AgentPromptInfo in = new AgentPromptInfo(agent); + AgentPrintWriter out = agent.getOut(); + Preferences prefs = agent.m_configuration.getPreferences(); if (agent.m_advancedSetup) { - setup_cmd.performAdvancedSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), - agent.getOut()); + setup_cmd.performAdvancedSetup(prefs, in, out); } else { - setup_cmd.performBasicSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), agent - .getOut()); + setup_cmd.performBasicSetup(prefs, in, out); } } @@ -459,7 +458,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = AgentInputReaderFactory.create(); + m_input = null; m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -477,6 +476,9 @@ public class AgentMain { m_commandLineArgs = args; processArguments(m_commandLineArgs); + if (m_input == null) { + m_input = AgentInputReaderFactory.create(this); + } m_promptCommands = new HashMap<String, Class<? extends AgentPromptCommand>>(); setupPromptCommandsMap(m_promptCommands); @@ -805,32 +807,6 @@ public class AgentMain { } /** - * In some cases, we want to read console input in a native way (that is, using the native system to read the - * keyboard input). This is mainly useful when you want to read in prompt answers which include passwords and you do - * not want to echo what the user typed. - * - * @return object that can be used to read input with the typed data being echoed or not - */ - public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); - } - - /** * Returns the object that can be used to obtain I18N messages from the agent's resource bundle in the user's * locale. * @@ -1097,10 +1073,10 @@ public class AgentMain { // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = AgentInputReaderFactory.create(); + m_input = AgentInputReaderFactory.create(this); } catch (IOException e1) { m_input = null; - } + } m_stdinInput = true; input_string = ""; } else { @@ -2691,12 +2667,13 @@ public class AgentMain { * @throws HelpException if help was requested and the agent should not be created */ private void processArguments(String[] args) throws Exception { - String sopts = "-:hdlasntuD:i:o:c:p:"; + String sopts = "-:hdlasntuD:i:o:c:p:e:"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'), new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), new LongOpt("config", LongOpt.REQUIRED_ARGUMENT, null, 'c'), new LongOpt("pref", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), @@ -2789,6 +2766,11 @@ public class AgentMain { break; } + case 'e': { + AgentInputReaderFactory.setConsoleType(getopt.getOptarg()); + break; + } + case 'd': { m_daemonMode = true; break; @@ -2798,7 +2780,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = AgentInputReaderFactory.create(new FileInputStream(script)); + m_input = AgentInputReaderFactory.create(this, script); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java deleted file mode 100644 index 287421d..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note - * that if the native libraries are not available or have been disabled, this will effectively fallback to using the - * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} - * will do the same as {@link #readLine()}). - * - * @author John Mazzitelli - */ -public class AgentNativePromptInfo implements PromptInput { - private final SystemInfo systemInfo; - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the system info used to obtain the console input - * natively. The agent is provided so it can give us a fallback stream where input can be read in case either <code> - * sysinfo</code> is <code>null</code> or it is not a native implementation (as will be the case if the platform - * where this object is running does not have native libraries for it). - * - * @param sysinfo the object where native console input can be read (may be <code>null</code>) - * @param agent the agent that will be doing the prompting and will provide us with a fallback input stream if - * <code>sysinfo</code> is <code>null</code> or not a native implementation - */ - public AgentNativePromptInfo(SystemInfo sysinfo, AgentMain agent) { - this.systemInfo = sysinfo; - this.agent = agent; - } - - public String readLine() throws IOException { - String input; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - input = systemInfo.readLineFromConsole(false); - } - - return input; - } - - public String readLineNoEcho() throws IOException { - String input = null; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - while (true) { - // get the answer the first time - input = systemInfo.readLineFromConsole(true); - - // get the answer a second time - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - String confirmation = systemInfo.readLineFromConsole(true); - systemInfo.writeLineToConsole("\n"); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - } - } - - return input; - } -} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java new file mode 100644 index 0000000..9984626 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note + * that if the native libraries are not available or have been disabled, this will effectively fallback to using the + * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} + * will do the same as {@link #readLine()}). + * + * @author John Mazzitelli + */ +public class AgentPromptInfo implements PromptInput { + + private final AgentMain agent; + + public AgentPromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLine(); + } else { + throw new IOException("Agent not accepting input"); + } + } + + public String readLineNoEcho() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLineNoEcho(); + } else { + throw new IOException("Agent not accepting input"); + } + } +} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java index 4d691c2..70e8e84 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java @@ -174,7 +174,19 @@ public class AgentUpdateThread extends Thread { if (results.getError() != null) { throw results.getError(); } - tryAgain = false; + + // update has started! if this agent is running in non-daemon mode, kill + // the input stream so the input thread knows to shutdown now + try { + AgentInputReader in = this.agent.getIn(); + if (in != null) { + System.in.close(); // we must ensure we close this directly! + in.close(); + } + } catch (Throwable t) { + } finally { + tryAgain = false; + } } catch (Throwable t) { showErrorMessage(AgentI18NResourceKeys.UPDATE_THREAD_EXCEPTION, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java new file mode 100644 index 0000000..15a3a89 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java @@ -0,0 +1,90 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +import jline.ConsoleReader; + +public class JLineAgentInputReader implements AgentInputReader { + + private final ConsoleReader jline; + private final AgentMain agent; + private final boolean consoleInput; + + public JLineAgentInputReader(AgentMain agent) throws IOException { + this.jline = new ConsoleReader(); + this.agent = agent; + this.consoleInput = true; + } + + public JLineAgentInputReader(AgentMain agent, FileInputStream fis) throws IOException { + this.jline = new ConsoleReader(fis, agent.getOut()); + this.agent = agent; + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.jline.readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time - the '*' is echoed back to the user + input = jline.readLine(Character.valueOf('*')); + + if (!isConsole()) { + break; // not reading input from a console, so we don't ask for confirmation + } + + // get the answer a second time + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + this.agent.getOut().println(); + String confirmation = jline.readLine(Character.valueOf('*')); + this.agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + this.agent.getOut().println(); + } + + return input; + } + + public void close() throws IOException { + InputStream input = jline.getInput(); + if (input != null) { + input.close(); + } + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java new file mode 100644 index 0000000..7003457 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java @@ -0,0 +1,60 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import jline.ConsoleReader; + +public class JavaAgentInputReader implements AgentInputReader { + + private final BufferedReader reader; + private final boolean consoleInput; + + public JavaAgentInputReader() throws IOException { + this.reader = new BufferedReader(new InputStreamReader(System.in)); + this.consoleInput = true; + } + + public JavaAgentInputReader(FileReader fr) throws IOException { + this.reader = new BufferedReader(fr); + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.reader.readLine(); + } + + public String readLineNoEcho() throws IOException { + return this.reader.readLine(); // can't mask the input with this Java API + } + + public void close() throws IOException { + this.reader.close(); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java deleted file mode 100644 index 3de70f4..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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; - -import java.io.FileInputStream; -import java.io.IOException; - -import jline.ConsoleReader; - -public class JlineAgentInputReader implements AgentInputReader { - - private ConsoleReader jline; - - public JlineAgentInputReader() throws IOException { - jline = new ConsoleReader(); - } - - public JlineAgentInputReader(FileInputStream fis) throws IOException { - jline = new ConsoleReader(fis, null); - } - - public String readLine() throws IOException { - return jline.readLine(); - } - - public String readLine(char mask) throws IOException { - return jline.readLine(Character.valueOf(mask)); - } - - public void close() throws IOException { - jline.getInput().close(); - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java new file mode 100644 index 0000000..f3b29ce --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java @@ -0,0 +1,73 @@ +package org.rhq.enterprise.agent; + +import java.io.FileReader; +import java.io.IOException; + +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Uses the SIGAR API when appropriate to read in console input. + * This falls back to the Java-only superclass implementation if + * the native SIGAR API is not available. + * + * @author John Mazzitelli + */ +public class SigarAgentInputReader extends JavaAgentInputReader { + + private final AgentMain agent; + + public SigarAgentInputReader(AgentMain agent) throws IOException { + super(); + this.agent = agent; + } + + public SigarAgentInputReader(AgentMain agent, FileReader fr) throws IOException { + super(fr); + this.agent = agent; + } + + @Override + public String readLine() throws IOException { + String input; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + input = systemInfo.readLineFromConsole(false); + } + + return input; + } + + @Override + public String readLineNoEcho() throws IOException { + String input = null; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + while (true) { + // get the answer the first time + input = systemInfo.readLineFromConsole(true); + + // get the answer a second time + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + String confirmation = systemInfo.readLineFromConsole(true); + systemInfo.writeLineToConsole("\n"); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + } + } + + return input; + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d2aa065..68da9a6 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,6 +28,12 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { + @I18NMessage("Specified bad console type [{0}]") + String AGENT_INPUT_READER_FACTORY_BAD_TYPE = "AgentMain.input-reader-factory-bad-type"; + + @I18NMessage("Failed to create console input reader of type [{0}]") + String AGENT_INPUT_READER_FACTORY_ERROR = "AgentMain.input-reader-factory-error"; + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -549,6 +555,7 @@ public interface AgentI18NResourceKeys { + "\\ -c, --config=<filename> Specifies an agent configuration preferences file (on filesystem or classpath)\\n\\\n" + "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n" + "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n" + + "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n" + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java index 57add17..4c9226a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java @@ -31,6 +31,7 @@ import org.jboss.remoting.security.SSLSocketBuilder; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.AgentPromptInfo; import org.rhq.enterprise.agent.i18n.AgentI18NFactory; import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; import org.rhq.enterprise.agent.i18n.AgentSetupInstructions; @@ -78,11 +79,11 @@ public class SetupPromptCommand implements AgentPromptCommand { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.SETUP_MUST_BE_STOPPED)); } else { if (args.length == 1) { - performBasicSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performBasicSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ADVANCED))) { - performAdvancedSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAdvancedSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ALL))) { - performAllSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAllSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); } commit 1f3d5356a7d1257f86effa4e3f83b604d9bed87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 23:44:13 2010 -0500 start abstracting out the input reader diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java new file mode 100644 index 0000000..dc6644b --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -0,0 +1,54 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.IOException; + +/** + * Abstracts out the console input to allow us to use either a native console or a Java based console. + * + * @author John Mazzitelli + */ +public interface AgentInputReader { + /** + * Reads a line from the input console. + * + * @return the line + * @throws IOException + */ + String readLine() throws IOException; + + /** + * Reads a line from the input console, echoing out the 'mask' character as opposed to the character + * typed by the user. If the console implementation does not support mask echoes, either the + * user-entered character is masked or some other masking is performed in an implementation specific way. + * + * @param mask character to echo back to the user when the user types in the line. + * @return the line typed by the user + * @throws IOException + */ + String readLine(char mask) throws IOException; + + /** + * Close the reader. + * @throws IOException + */ + void close() throws IOException; +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java new file mode 100644 index 0000000..e3ebe4c --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +/** + * Creates implementations of the input reader depending on the need for a native console library. + * + * @author John Mazzitelli + */ +public class AgentInputReaderFactory { + public static AgentInputReader create() throws IOException { + return new JlineAgentInputReader(); + } + public static AgentInputReader create(FileInputStream fis) throws IOException { + return new JlineAgentInputReader(fis); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index d75cb7d..aba4eb5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -21,14 +21,12 @@ package org.rhq.enterprise.agent; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; @@ -58,8 +56,6 @@ import java.util.prefs.Preferences; import javax.management.MBeanServer; import javax.management.ObjectName; -import jline.ConsoleReader; - import mazz.i18n.Logger; import mazz.i18n.Msg; @@ -208,7 +204,7 @@ public class AgentMain { /** * The stream where the commands are input. */ - private ConsoleReader m_input; + private AgentInputReader m_input; /** * Will be <code>true</code> if the input is coming directly from stdin; <code>false</code> if an input script file @@ -463,7 +459,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -804,7 +800,7 @@ public class AgentMain { * * @return the input stream or <code>null</code> if the agent is not currently accepting input */ - public ConsoleReader getIn() { + public AgentInputReader getIn() { return m_input; } @@ -1093,13 +1089,17 @@ public class AgentMain { } } else if (!m_stdinInput) { // if we are processing a script, we hit the EOF, so close the input stream - + try { + m_input.close(); + } catch (IOException e1) { + } // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); } catch (IOException e1) { + m_input = null; } m_stdinInput = true; input_string = ""; @@ -2798,7 +2798,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = new ConsoleReader(new FileInputStream(script), null); + m_input = AgentInputReaderFactory.create(new FileInputStream(script)); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java new file mode 100644 index 0000000..3de70f4 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +import jline.ConsoleReader; + +public class JlineAgentInputReader implements AgentInputReader { + + private ConsoleReader jline; + + public JlineAgentInputReader() throws IOException { + jline = new ConsoleReader(); + } + + public JlineAgentInputReader(FileInputStream fis) throws IOException { + jline = new ConsoleReader(fis, null); + } + + public String readLine() throws IOException { + return jline.readLine(); + } + + public String readLine(char mask) throws IOException { + return jline.readLine(Character.valueOf(mask)); + } + + public void close() throws IOException { + jline.getInput().close(); + } +} commit bd631f0dda01d2f6e594fe1c1f2df92155f4c893 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Feb 2 22:55:14 2010 -0500 fix eclipse settings so that code gets auto-reformatted on save diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 10d36a9..e7120a1 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Jan 14 12:59:22 EST 2010 +#Tue Feb 02 22:50:09 EST 2010 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true cleanup_profile=_RHQ cleanup_settings_version=2 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_RHQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e commit 95511f633370a76ab42b2b4b8eabe4259fff3903 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:36 2010 -0500 put this back in the agent diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 10a1c32a5aee2174b29a02eb70cf3a05b9a1f724 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:30:20 2010 -0500 opps. this should not be here diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} commit 86270a451083b341baa3710355c9ae4c02292a89 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 22:14:33 2010 -0500 put this back, but don't integrate it yet diff --git a/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java new file mode 100644 index 0000000..b1c4db6 --- /dev/null +++ b/modules/common/jboss-as/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java @@ -0,0 +1,71 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline + * command prompt in the agent. + */ +public class JlinePromptInfo implements PromptInput { + private final AgentMain agent; + + /** + * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve + * the jline command prompt from. + */ + public JlinePromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + + return agent.getIn().readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time + // A (char)0 will blank it out. I like stars + input = agent.getIn().readLine('*'); + + // get the answer a second time + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + agent.getOut().println(); + String confirmation = agent.getIn().readLine('*'); + agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + agent.getOut().println(); + } + + return input; + } +} commit 80bf4075b6d4c3a84e1b9c788730faa191769657 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:26:27 2010 -0500 fixing .classpath (again) diff --git a/.classpath b/.classpath index 9658f94..3b948dd 100644 --- a/.classpath +++ b/.classpath @@ -112,7 +112,6 @@ <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/virt/src/test/java"/> <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> commit 1b160377f367eda9254a2bf73d1ec0ec89e5b85c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 21:09:57 2010 -0500 why does antlr-config keep showing up in .classpath? diff --git a/.classpath b/.classpath index ae63f80..9658f94 100644 --- a/.classpath +++ b/.classpath @@ -121,7 +121,6 @@ <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/antlr-config/src/main/antlr3"/> <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/>

1 0

[rhq] 2 commits - modules/enterprise
by mazz 03 Feb '10

03 Feb '10

modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115 ++++++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 70 ++---- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 91 ------- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 14 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 90 +++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60 +++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java | 71 ------ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73 ++++++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 7 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 7 12 files changed, 509 insertions(+), 210 deletions(-) New commits: commit e01ac1302020282dfa2f0583c30ff859089143ea Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Feb 3 02:56:02 2010 -0500 refactor the jline integration to fix problems and enhance it. this commit will allow the user to select the implementation to use; you can now use the command line option --console (-e) to say if you want the console input to be read by "java" (pure Java implementation), "sigar" (this was the original native console way we had before) or "jline" (which is the new native console way). This allows a user to select a non-native way to read input in case they are running on a platform that doesn't support the native library (jline's native lib or sigar's native lib) or in case the native library has a bug and is causing the agent to crash. If you use "sigar", and you disable the native system API (native --disable), this will cause the console to fallback to the "java" console impl. If user is using "jline", there is no fallback to - if jline is giving problems, you must exit the agent, and specify a --console argument to override the console to use. The default is "jline". diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java index dc6644b..4f00ab1 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -28,24 +28,32 @@ import java.io.IOException; */ public interface AgentInputReader { /** + * Indicates if the input is coming from a console (i.e. keyboard) or if its coming from + * a file. + * + * @return <code>true</code> if console is the source of the input; <code>false</code> if file is the source + */ + boolean isConsole(); + + /** * Reads a line from the input console. * * @return the line * @throws IOException */ String readLine() throws IOException; - + /** - * Reads a line from the input console, echoing out the 'mask' character as opposed to the character - * typed by the user. If the console implementation does not support mask echoes, either the - * user-entered character is masked or some other masking is performed in an implementation specific way. + * Read a line of input, but do not echo back to the user what is being typed. This is used mainly when asking for + * things like passwords. + * If the console implementation does not support no-echo input, the input will be + * output as the user typed it. * - * @param mask character to echo back to the user when the user types in the line. * @return the line typed by the user * @throws IOException */ - String readLine(char mask) throws IOException; - + String readLineNoEcho() throws IOException; + /** * Close the reader. * @throws IOException diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java index e3ebe4c..71f0e4f 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -18,19 +18,98 @@ */ package org.rhq.enterprise.agent; +import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; +import mazz.i18n.Logger; + +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + /** * Creates implementations of the input reader depending on the need for a native console library. * * @author John Mazzitelli */ public class AgentInputReaderFactory { - public static AgentInputReader create() throws IOException { - return new JlineAgentInputReader(); + private static final Logger LOG = AgentI18NFactory.getLogger(AgentInputReaderFactory.class); + + public static enum ConsoleType { + java, sigar, jline + } + + private static ConsoleType consoleType = ConsoleType.jline; + + public static AgentInputReader create(AgentMain agent) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(); + break; + case sigar: + input = new SigarAgentInputReader(agent); + break; + case jline: + input = new JLineAgentInputReader(agent); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(); + } + + return input; } - public static AgentInputReader create(FileInputStream fis) throws IOException { - return new JlineAgentInputReader(fis); + + public static AgentInputReader create(AgentMain agent, File file) throws IOException { + AgentInputReader input = null; + + try { + switch (consoleType) { + case java: + input = new JavaAgentInputReader(new FileReader(file)); + break; + case sigar: + input = new SigarAgentInputReader(agent, new FileReader(file)); + break; + case jline: + input = new JLineAgentInputReader(agent, new FileInputStream(file)); + break; + } + } catch (Exception e) { + input = null; + LOG.warn(e, AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_ERROR, consoleType); + } + + if (input == null) { + input = new JavaAgentInputReader(new FileReader(file)); + } + + return input; + } + + public static ConsoleType getConsoleType() { + return consoleType; + } + + public static void setConsoleType(ConsoleType type) { + consoleType = type; + } + + public static void setConsoleType(String typeStr) { + try { + setConsoleType(ConsoleType.valueOf(typeStr)); + } catch (Exception e) { + throw new IllegalArgumentException(LOG.getMsgString( + AgentI18NResourceKeys.AGENT_INPUT_READER_FACTORY_BAD_TYPE, typeStr)); + } } } diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index aba4eb5..2baf5f5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -89,7 +89,6 @@ import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.ObjectNameFactory; import org.rhq.core.util.exception.ThrowableUtil; @@ -152,7 +151,6 @@ import org.rhq.enterprise.communications.command.server.CommandListener; import org.rhq.enterprise.communications.command.server.IncomingCommandTrace; import org.rhq.enterprise.communications.util.CommandTraceUtil; import org.rhq.enterprise.communications.util.SecurityUtil; -import org.rhq.enterprise.communications.util.prefs.PromptInput; /** * The main class of the agent runtime container. @@ -387,12 +385,13 @@ public class AgentMain { if (agent.m_forcedSetup || (!agent.m_daemonMode && !agent.m_configuration.isAgentConfigurationSetup())) { SetupPromptCommand setup_cmd = new SetupPromptCommand(); + AgentPromptInfo in = new AgentPromptInfo(agent); + AgentPrintWriter out = agent.getOut(); + Preferences prefs = agent.m_configuration.getPreferences(); if (agent.m_advancedSetup) { - setup_cmd.performAdvancedSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), - agent.getOut()); + setup_cmd.performAdvancedSetup(prefs, in, out); } else { - setup_cmd.performBasicSetup(agent.m_configuration.getPreferences(), agent.getNativeIn(), agent - .getOut()); + setup_cmd.performBasicSetup(prefs, in, out); } } @@ -459,7 +458,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = AgentInputReaderFactory.create(); + m_input = null; m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -477,6 +476,9 @@ public class AgentMain { m_commandLineArgs = args; processArguments(m_commandLineArgs); + if (m_input == null) { + m_input = AgentInputReaderFactory.create(this); + } m_promptCommands = new HashMap<String, Class<? extends AgentPromptCommand>>(); setupPromptCommandsMap(m_promptCommands); @@ -805,32 +807,6 @@ public class AgentMain { } /** - * In some cases, we want to read console input in a native way (that is, using the native system to read the - * keyboard input). This is mainly useful when you want to read in prompt answers which include passwords and you do - * not want to echo what the user typed. - * - * @return object that can be used to read input with the typed data being echoed or not - */ - public PromptInput getNativeIn() { - SystemInfo sysinfo = null; - - // if we are not in daemon mode, we are running in a console and thus we can try to use - // the native library to get its input. - // If we are in daemon mode, we aren't running in a console so we need to pass null - // in for sysinfo thus causing the prompt info implementation to use our fallback buffered - // reader (which is either empty or is contents of an input file that was piped in via --input. - if (!m_daemonMode) { - // just in case the native stuff has a bug in the console stuff (JBNATIVE-42 as an example), - // be able to configure the agent to ignore the native console - if (Boolean.getBoolean("rhq.agent.do-not-use-native-console") == false) { - sysinfo = SystemInfoFactory.createSystemInfo(); - } - } - - return new AgentNativePromptInfo(sysinfo, this); - } - - /** * Returns the object that can be used to obtain I18N messages from the agent's resource bundle in the user's * locale. * @@ -1097,10 +1073,10 @@ public class AgentMain { // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = AgentInputReaderFactory.create(); + m_input = AgentInputReaderFactory.create(this); } catch (IOException e1) { m_input = null; - } + } m_stdinInput = true; input_string = ""; } else { @@ -2691,12 +2667,13 @@ public class AgentMain { * @throws HelpException if help was requested and the agent should not be created */ private void processArguments(String[] args) throws Exception { - String sopts = "-:hdlasntuD:i:o:c:p:"; + String sopts = "-:hdlasntuD:i:o:c:p:e:"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'), new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), new LongOpt("config", LongOpt.REQUIRED_ARGUMENT, null, 'c'), new LongOpt("pref", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), @@ -2789,6 +2766,11 @@ public class AgentMain { break; } + case 'e': { + AgentInputReaderFactory.setConsoleType(getopt.getOptarg()); + break; + } + case 'd': { m_daemonMode = true; break; @@ -2798,7 +2780,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = AgentInputReaderFactory.create(new FileInputStream(script)); + m_input = AgentInputReaderFactory.create(this, script); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java deleted file mode 100644 index 287421d..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; -import org.rhq.core.system.SystemInfo; -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note - * that if the native libraries are not available or have been disabled, this will effectively fallback to using the - * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} - * will do the same as {@link #readLine()}). - * - * @author John Mazzitelli - */ -public class AgentNativePromptInfo implements PromptInput { - private final SystemInfo systemInfo; - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the system info used to obtain the console input - * natively. The agent is provided so it can give us a fallback stream where input can be read in case either <code> - * sysinfo</code> is <code>null</code> or it is not a native implementation (as will be the case if the platform - * where this object is running does not have native libraries for it). - * - * @param sysinfo the object where native console input can be read (may be <code>null</code>) - * @param agent the agent that will be doing the prompting and will provide us with a fallback input stream if - * <code>sysinfo</code> is <code>null</code> or not a native implementation - */ - public AgentNativePromptInfo(SystemInfo sysinfo, AgentMain agent) { - this.systemInfo = sysinfo; - this.agent = agent; - } - - public String readLine() throws IOException { - String input; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - input = systemInfo.readLineFromConsole(false); - } - - return input; - } - - public String readLineNoEcho() throws IOException { - String input = null; - - if ((systemInfo == null) || !systemInfo.isNative()) { - input = agent.getIn().readLine(); - } else { - while (true) { - // get the answer the first time - input = systemInfo.readLineFromConsole(true); - - // get the answer a second time - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - String confirmation = systemInfo.readLineFromConsole(true); - systemInfo.writeLineToConsole("\n"); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - } - } - - return input; - } -} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java new file mode 100644 index 0000000..9984626 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java @@ -0,0 +1,59 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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; + +import java.io.IOException; +import org.rhq.core.system.SystemInfo; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; +import org.rhq.enterprise.communications.util.prefs.PromptInput; + +/** + * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the native system. Note + * that if the native libraries are not available or have been disabled, this will effectively fallback to using the + * Java-only mechanism to read input and will therefore always echo the input (i.e. calling {@link #readLineNoEcho()} + * will do the same as {@link #readLine()}). + * + * @author John Mazzitelli + */ +public class AgentPromptInfo implements PromptInput { + + private final AgentMain agent; + + public AgentPromptInfo(AgentMain agent) { + this.agent = agent; + } + + public String readLine() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLine(); + } else { + throw new IOException("Agent not accepting input"); + } + } + + public String readLineNoEcho() throws IOException { + AgentInputReader input = this.agent.getIn(); + if (input != null) { + return input.readLineNoEcho(); + } else { + throw new IOException("Agent not accepting input"); + } + } +} \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java index 4d691c2..70e8e84 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java @@ -174,7 +174,19 @@ public class AgentUpdateThread extends Thread { if (results.getError() != null) { throw results.getError(); } - tryAgain = false; + + // update has started! if this agent is running in non-daemon mode, kill + // the input stream so the input thread knows to shutdown now + try { + AgentInputReader in = this.agent.getIn(); + if (in != null) { + System.in.close(); // we must ensure we close this directly! + in.close(); + } + } catch (Throwable t) { + } finally { + tryAgain = false; + } } catch (Throwable t) { showErrorMessage(AgentI18NResourceKeys.UPDATE_THREAD_EXCEPTION, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java new file mode 100644 index 0000000..15a3a89 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java @@ -0,0 +1,90 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +import jline.ConsoleReader; + +public class JLineAgentInputReader implements AgentInputReader { + + private final ConsoleReader jline; + private final AgentMain agent; + private final boolean consoleInput; + + public JLineAgentInputReader(AgentMain agent) throws IOException { + this.jline = new ConsoleReader(); + this.agent = agent; + this.consoleInput = true; + } + + public JLineAgentInputReader(AgentMain agent, FileInputStream fis) throws IOException { + this.jline = new ConsoleReader(fis, agent.getOut()); + this.agent = agent; + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.jline.readLine(); + } + + public String readLineNoEcho() throws IOException { + String input = null; + + while (true) { + // get the answer the first time - the '*' is echoed back to the user + input = jline.readLine(Character.valueOf('*')); + + if (!isConsole()) { + break; // not reading input from a console, so we don't ask for confirmation + } + + // get the answer a second time + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + this.agent.getOut().println(); + String confirmation = jline.readLine(Character.valueOf('*')); + this.agent.getOut().println(); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + this.agent.getOut().write(this.agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + this.agent.getOut().println(); + } + + return input; + } + + public void close() throws IOException { + InputStream input = jline.getInput(); + if (input != null) { + input.close(); + } + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java new file mode 100644 index 0000000..7003457 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java @@ -0,0 +1,60 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import jline.ConsoleReader; + +public class JavaAgentInputReader implements AgentInputReader { + + private final BufferedReader reader; + private final boolean consoleInput; + + public JavaAgentInputReader() throws IOException { + this.reader = new BufferedReader(new InputStreamReader(System.in)); + this.consoleInput = true; + } + + public JavaAgentInputReader(FileReader fr) throws IOException { + this.reader = new BufferedReader(fr); + this.consoleInput = false; + } + + public boolean isConsole() { + return this.consoleInput; + } + + public String readLine() throws IOException { + return this.reader.readLine(); + } + + public String readLineNoEcho() throws IOException { + return this.reader.readLine(); // can't mask the input with this Java API + } + + public void close() throws IOException { + this.reader.close(); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java deleted file mode 100644 index 3de70f4..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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; - -import java.io.FileInputStream; -import java.io.IOException; - -import jline.ConsoleReader; - -public class JlineAgentInputReader implements AgentInputReader { - - private ConsoleReader jline; - - public JlineAgentInputReader() throws IOException { - jline = new ConsoleReader(); - } - - public JlineAgentInputReader(FileInputStream fis) throws IOException { - jline = new ConsoleReader(fis, null); - } - - public String readLine() throws IOException { - return jline.readLine(); - } - - public String readLine(char mask) throws IOException { - return jline.readLine(Character.valueOf(mask)); - } - - public void close() throws IOException { - jline.getInput().close(); - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java deleted file mode 100644 index b1c4db6..0000000 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlinePromptInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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; - -import java.io.IOException; - -import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; -import org.rhq.enterprise.communications.util.prefs.PromptInput; - -/** - * Provides a {@link PromptInput} implementation that the agent can use to obtain input from the jline - * command prompt in the agent. - */ -public class JlinePromptInfo implements PromptInput { - private final AgentMain agent; - - /** - * Constructor for {@link AgentNativePromptInfo} that is given the agent main to retrieve - * the jline command prompt from. - */ - public JlinePromptInfo(AgentMain agent) { - this.agent = agent; - } - - public String readLine() throws IOException { - - return agent.getIn().readLine(); - } - - public String readLineNoEcho() throws IOException { - String input = null; - - while (true) { - // get the answer the first time - // A (char)0 will blank it out. I like stars - input = agent.getIn().readLine('*'); - - // get the answer a second time - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); - agent.getOut().println(); - String confirmation = agent.getIn().readLine('*'); - agent.getOut().println(); - - // make sure the first and second answers match; otherwise, ask again - if (input.equals(confirmation)) { - break; - } - - agent.getOut().write(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); - agent.getOut().println(); - } - - return input; - } -} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java new file mode 100644 index 0000000..f3b29ce --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java @@ -0,0 +1,73 @@ +package org.rhq.enterprise.agent; + +import java.io.FileReader; +import java.io.IOException; + +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Uses the SIGAR API when appropriate to read in console input. + * This falls back to the Java-only superclass implementation if + * the native SIGAR API is not available. + * + * @author John Mazzitelli + */ +public class SigarAgentInputReader extends JavaAgentInputReader { + + private final AgentMain agent; + + public SigarAgentInputReader(AgentMain agent) throws IOException { + super(); + this.agent = agent; + } + + public SigarAgentInputReader(AgentMain agent, FileReader fr) throws IOException { + super(fr); + this.agent = agent; + } + + @Override + public String readLine() throws IOException { + String input; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + input = systemInfo.readLineFromConsole(false); + } + + return input; + } + + @Override + public String readLineNoEcho() throws IOException { + String input = null; + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + if ((systemInfo == null) || !systemInfo.isNative() || !isConsole()) { + input = super.readLine(); + } else { + while (true) { + // get the answer the first time + input = systemInfo.readLineFromConsole(true); + + // get the answer a second time + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM)); + String confirmation = systemInfo.readLineFromConsole(true); + systemInfo.writeLineToConsole("\n"); + + // make sure the first and second answers match; otherwise, ask again + if (input.equals(confirmation)) { + break; + } + + systemInfo.writeLineToConsole(agent.getI18NMsg().getMsg(AgentI18NResourceKeys.PROMPT_CONFIRM_FAILED)); + } + } + + return input; + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d2aa065..68da9a6 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -28,6 +28,12 @@ import mazz.i18n.annotation.I18NResourceBundle; */ @I18NResourceBundle(baseName = "agent-messages", defaultLocale = "en") public interface AgentI18NResourceKeys { + @I18NMessage("Specified bad console type [{0}]") + String AGENT_INPUT_READER_FACTORY_BAD_TYPE = "AgentMain.input-reader-factory-bad-type"; + + @I18NMessage("Failed to create console input reader of type [{0}]") + String AGENT_INPUT_READER_FACTORY_ERROR = "AgentMain.input-reader-factory-error"; + @I18NMessage("!!! This agent is registering under the loopback address [{0}] - this should only be done for testing " + "or demo purposes - this agent will only be able to interact with a server running on the same host as this agent") String REGISTERING_WITH_LOOPBACK = "AgentMain.registering-with-loopback"; @@ -549,6 +555,7 @@ public interface AgentI18NResourceKeys { + "\\ -c, --config=<filename> Specifies an agent configuration preferences file (on filesystem or classpath)\\n\\\n" + "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n" + "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n" + + "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n" + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java index 57add17..4c9226a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java @@ -31,6 +31,7 @@ import org.jboss.remoting.security.SSLSocketBuilder; import org.rhq.enterprise.agent.AgentConfiguration; import org.rhq.enterprise.agent.AgentConfigurationConstants; import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.AgentPromptInfo; import org.rhq.enterprise.agent.i18n.AgentI18NFactory; import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; import org.rhq.enterprise.agent.i18n.AgentSetupInstructions; @@ -78,11 +79,11 @@ public class SetupPromptCommand implements AgentPromptCommand { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.SETUP_MUST_BE_STOPPED)); } else { if (args.length == 1) { - performBasicSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performBasicSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ADVANCED))) { - performAdvancedSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAdvancedSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else if ((args.length == 2) && args[1].equals(MSG.getMsg(AgentI18NResourceKeys.SETUP_ALL))) { - performAllSetup(agent.getConfiguration().getPreferences(), agent.getNativeIn(), agent.getOut()); + performAllSetup(agent.getConfiguration().getPreferences(), new AgentPromptInfo(agent), agent.getOut()); } else { agent.getOut().println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); } commit 1f3d5356a7d1257f86effa4e3f83b604d9bed87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Feb 2 23:44:13 2010 -0500 start abstracting out the input reader diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java new file mode 100644 index 0000000..dc6644b --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java @@ -0,0 +1,54 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.IOException; + +/** + * Abstracts out the console input to allow us to use either a native console or a Java based console. + * + * @author John Mazzitelli + */ +public interface AgentInputReader { + /** + * Reads a line from the input console. + * + * @return the line + * @throws IOException + */ + String readLine() throws IOException; + + /** + * Reads a line from the input console, echoing out the 'mask' character as opposed to the character + * typed by the user. If the console implementation does not support mask echoes, either the + * user-entered character is masked or some other masking is performed in an implementation specific way. + * + * @param mask character to echo back to the user when the user types in the line. + * @return the line typed by the user + * @throws IOException + */ + String readLine(char mask) throws IOException; + + /** + * Close the reader. + * @throws IOException + */ + void close() throws IOException; +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java new file mode 100644 index 0000000..e3ebe4c --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +/** + * Creates implementations of the input reader depending on the need for a native console library. + * + * @author John Mazzitelli + */ +public class AgentInputReaderFactory { + public static AgentInputReader create() throws IOException { + return new JlineAgentInputReader(); + } + public static AgentInputReader create(FileInputStream fis) throws IOException { + return new JlineAgentInputReader(fis); + } +} diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index d75cb7d..aba4eb5 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -21,14 +21,12 @@ package org.rhq.enterprise.agent; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; @@ -58,8 +56,6 @@ import java.util.prefs.Preferences; import javax.management.MBeanServer; import javax.management.ObjectName; -import jline.ConsoleReader; - import mazz.i18n.Logger; import mazz.i18n.Msg; @@ -208,7 +204,7 @@ public class AgentMain { /** * The stream where the commands are input. */ - private ConsoleReader m_input; + private AgentInputReader m_input; /** * Will be <code>true</code> if the input is coming directly from stdin; <code>false</code> if an input script file @@ -463,7 +459,7 @@ public class AgentMain { m_agentHomeDirectory = null; m_daemonMode = false; - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); m_output = new AgentPrintWriter(System.out, true); m_stdinInput = true; m_configuration = null; @@ -804,7 +800,7 @@ public class AgentMain { * * @return the input stream or <code>null</code> if the agent is not currently accepting input */ - public ConsoleReader getIn() { + public AgentInputReader getIn() { return m_input; } @@ -1093,13 +1089,17 @@ public class AgentMain { } } else if (!m_stdinInput) { // if we are processing a script, we hit the EOF, so close the input stream - + try { + m_input.close(); + } catch (IOException e1) { + } // if we are not in daemon mode, let's now start processing prompt commands coming in via stdin if (!m_daemonMode) { try { - m_input = new ConsoleReader() ; + m_input = AgentInputReaderFactory.create(); } catch (IOException e1) { + m_input = null; } m_stdinInput = true; input_string = ""; @@ -2798,7 +2798,7 @@ public class AgentMain { File script = new File(getopt.getOptarg()); try { - m_input = new ConsoleReader(new FileInputStream(script), null); + m_input = AgentInputReaderFactory.create(new FileInputStream(script)); m_stdinInput = false; } catch (Exception e) { throw new IllegalArgumentException(MSG.getMsg(AgentI18NResourceKeys.BAD_INPUT_FILE, script, e)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java new file mode 100644 index 0000000..3de70f4 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JlineAgentInputReader.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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; + +import java.io.FileInputStream; +import java.io.IOException; + +import jline.ConsoleReader; + +public class JlineAgentInputReader implements AgentInputReader { + + private ConsoleReader jline; + + public JlineAgentInputReader() throws IOException { + jline = new ConsoleReader(); + } + + public JlineAgentInputReader(FileInputStream fis) throws IOException { + jline = new ConsoleReader(fis, null); + } + + public String readLine() throws IOException { + return jline.readLine(); + } + + public String readLine(char mask) throws IOException { + return jline.readLine(Character.valueOf(mask)); + } + + public void close() throws IOException { + jline.getInput().close(); + } +}

1 0

[rhq] .settings/org.eclipse.jdt.ui.prefs
by Joseph Marques 03 Feb '10

03 Feb '10

.settings/org.eclipse.jdt.ui.prefs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bd631f0dda01d2f6e594fe1c1f2df92155f4c893 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Feb 2 22:55:14 2010 -0500 fix eclipse settings so that code gets auto-reformatted on save diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 10d36a9..e7120a1 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,4 @@ -#Thu Jan 14 12:59:22 EST 2010 +#Tue Feb 02 22:50:09 EST 2010 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -52,7 +52,7 @@ cleanup.use_this_for_non_static_method_access_only_if_necessary=true cleanup_profile=_RHQ cleanup_settings_version=2 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_RHQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits February 2010