modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java | 172 +++++----- modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 4 2 files changed, 88 insertions(+), 88 deletions(-)
New commits: commit 4443f017ce764353f41e4c4ca17d334af5742234 Author: Jay Shaughnessy jshaughn@redhat.com Date: Mon Nov 28 13:50:13 2011 -0500
[Bug 754197 - When agent runs on loopback address, the advisory text is incorrect. Administration > High Availability does not exist] - Trivial - Fix the text - Also, fix some jdoc text in AgentRegistrationResults (reformatted as well). No code changes.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java index f1d58f3..f4e62d5 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java @@ -1,87 +1,87 @@ -/* - * 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.clientapi.server.core; - -import java.io.Serializable; -import java.util.ArrayList; - -import org.rhq.core.domain.cloud.composite.FailoverListComposite; -import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry; - -/** - * These are the results of a successful agent registration. After the agent has been registered by the server, this - * object will contain the identification information assigned to the agent by the server. It will also contain the - * list of servers this agent can fail over to an in high availability setup. - * - * @author John Mazzitelli - */ -public class AgentRegistrationResults implements Serializable { - private static final long serialVersionUID = 1L; - - private String agentToken; - private FailoverListComposite failoverList; - - /** - * The agent token that the agent must use in order to communicate with the server in the future. - * - * @return the agent's token assigned to it by the server - */ - public String getAgentToken() { - return agentToken; - } - - /** - * See {@link #getAgentToken()}. - * - * @param token - */ - public void setAgentToken(String token) { - agentToken = token; - } - - /** - * The FailoverListComposite that the agent must use in order to communicate with the server in the future. - * - * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty) - */ - public FailoverListComposite getFailoverList() { - return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>()); - } - - /** - * See {@link #getFailoverList()}. - * - * @param failoverList - */ - public void setFailoverList(FailoverListComposite failoverList) { - this.failoverList = failoverList; - } - - /** - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]"; - } +/* + * 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.clientapi.server.core; + +import java.io.Serializable; +import java.util.ArrayList; + +import org.rhq.core.domain.cloud.composite.FailoverListComposite; +import org.rhq.core.domain.cloud.composite.FailoverListComposite.ServerEntry; + +/** + * These are the results of a successful agent registration. After the agent has been registered by the server, this + * object will contain the identification information assigned to the agent by the server. It will also contain the + * list of servers this agent can fail over to in a high availability setup. + * + * @author John Mazzitelli + */ +public class AgentRegistrationResults implements Serializable { + private static final long serialVersionUID = 1L; + + private String agentToken; + private FailoverListComposite failoverList; + + /** + * The agent token that the agent must use in order to communicate with the server in the future. + * + * @return the agent's token assigned to it by the server + */ + public String getAgentToken() { + return agentToken; + } + + /** + * See {@link #getAgentToken()}. + * + * @param token + */ + public void setAgentToken(String token) { + agentToken = token; + } + + /** + * The FailoverListComposite that the agent must use in order to communicate with the server in the future. + * + * @return the FailoverListComposite assigned to it by the server (will not be <code>null</code> but may be empty) + */ + public FailoverListComposite getFailoverList() { + return failoverList != null ? failoverList : new FailoverListComposite(new ArrayList<ServerEntry>()); + } + + /** + * See {@link #getFailoverList()}. + * + * @param failoverList + */ + public void setFailoverList(FailoverListComposite failoverList) { + this.failoverList = failoverList; + } + + /** + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "AgentRegistrationResults: [agent-token=" + this.agentToken + "]"; + } } \ No newline at end of file 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 b0608c2..59702fc 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 @@ -212,7 +212,7 @@ public interface AgentI18NResourceKeys { @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.") + + "See the Administration (Topology) > 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") @@ -249,7 +249,7 @@ public interface AgentI18NResourceKeys { + "Please double check all public endpoints of your servers and ensure\n\\n" + "they are all reachable by this agent. The failed server endpoints are:\n\\n" // + "{1}\n\\n" // - + "See the Administration > High Availability > Servers in the server GUI\n\\n" + + "See the Administration (Topology) > Servers in the server GUI\n\\n" + "to change the public endpoint of a server.\n\\n" + "THIS AGENT WILL WAIT UNTIL ONE OF ITS SERVERS BECOMES REACHABLE!") String FAILOVER_LIST_CHECK_FAILED = "AgentMain.failover-list-check-failed";