added messaging hostname and exchange name to ReplicationMasterDTO and report it in ReplicationPanel

Change-Id: Ifa6ffa11ad51627e57424087e1d55222da22a79c
2026-10-28 14:57:12 +00:00 · 2015-12-10 11:29:16 +01:00
1 parent da692a2b9b
commit fc8e7cb664
@@ -4,8 +4,10 @@ encoding//src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.p
 encoding//src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_ru.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java=utf-8
+encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java=utf-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenter.java=utf-8
+encoding//src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorFilterPanel.java=utf-8
@@ -273,7 +273,8 @@ public class ReplicationPanel extends FlowPanel {
                    errorReporter.reportPersistentInformation(stringMessages.warningServerIsReplica());
                    registeredMasters.insertRow(i);
                    registeredMasters.setWidget(i, 0, new Label(stringMessages.replicatingFromMaster(replicatingFromMaster.getHostname(),
-                            replicatingFromMaster.getMessagingPort(), replicatingFromMaster.getServletPort())));
+                            replicatingFromMaster.getMessagingPort(), replicatingFromMaster.getServletPort(),
+                            replicatingFromMaster.getMessagingHostname(), replicatingFromMaster.getExchangeName())));
                    i++;
                    addButton.setEnabled(false);
                    stopReplicationButton.setEnabled(true);
@@ -325,7 +325,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
    String messagingPortNumber();
    String servletPortNumber();
    String registeredAt(String string);
-    String replicatingFromMaster(String hostname, int jmsPort, int servletPort);
+    String replicatingFromMaster(String hostname, int jmsPort, int servletPort, String messagingHostname, String exchangeName);
    String showWindSpeedSeries();
    String showWindDirectionSeries();
    String fleet();
@@ -336,7 +336,7 @@ courseMiddleLine=Course middle line
 messagingPortNumber=Messaging port number (0 for default)
 servletPortNumber=Servlet port number
 registeredAt=Registered at {0}
-replicatingFromMaster=Replicating from master {0}, messaging port {1}, servlet port {2}
+replicatingFromMaster=Replicating from master {0}:{2}, messaging port {3}:{1}, exchange {4}
 showWindSpeedSeries=Show wind speed data
 showWindDirectionSeries=Show wind directions data
 fleet=Fleet
@@ -337,7 +337,7 @@ courseMiddleLine=Kursmittellinie
 messagingPortNumber=Messaging-Portnummer (0 für Default)
 servletPortNumber=Servlet Portnummer
 registeredAt=Registriert {0}
-replicatingFromMaster=Repliziert von master {0}, Messaging Port {1}, Servlet Port {2}
+replicatingFromMaster=Repliziert von master {0}:{2}, Messaging Port {3}:{1}, Exchange {4}
 showWindSpeedSeries=Daten für Windgeschwindigkeit zeigen
 showWindDirectionSeries=Daten für Windrichtung zeigen
 fleet=Flotte
@@ -329,7 +329,7 @@ courseMiddleLine=Средняя линия курса
 messagingPortNumber=Номер порта обмена сообщениями ( по умолчанию 0)
 servletPortNumber=Номер порта сервлета
 registeredAt=Зарегистрирован в {0}
-replicatingFromMaster=Дублирование с основного {0}, порт передачи обмена сообщениями {1}, порт сервлета {2}
+replicatingFromMaster=Replicating from master {0}:{2}, messaging port {3}:{1}, exchange {4}
 showWindSpeedSeries=Показать данные о силе ветра
 showWindDirectionSeries=Показать данные о направлении ветра
 fleet=Флот
@@ -328,7 +328,7 @@ setFixedPassing=Set time as mark passing
 maximumSpeedOverGroundInKnotsTooltip=比赛中参赛队的最大实际速度
 twoMarkControlPoint=2-mark-controlpoint
 earlyStarters=Early starters
-replicatingFromMaster=Replicating from master {0}, messaging port {1}, servlet port {2}
+replicatingFromMaster=Replicating from master {0}:{2}, messaging port {3}:{1}, exchange {4}
 latitude=Latitude
 filterByLeaderboard=Filter by Leaderboard
 fromDeg=从 (角度)
@@ -3292,8 +3292,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
        if (replicatingFromMaster == null) {
            master = null;
        } else {
-            master = new ReplicationMasterDTO(replicatingFromMaster.getHostname(), replicatingFromMaster.getMessagingPort(),
-                    replicatingFromMaster.getServletPort());
+            master = new ReplicationMasterDTO(replicatingFromMaster.getHostname(), replicatingFromMaster.getServletPort(),
+                    replicatingFromMaster.getMessagingHostname(), replicatingFromMaster.getMessagingPort(), replicatingFromMaster.getExchangeName());
        }
        return new ReplicationStateDTO(master, replicaDTOs, service.getServerIdentifier().toString());
    }
@@ -6,12 +6,16 @@ public class ReplicationMasterDTO implements IsSerializable {
    private String hostname;
    private int messagingPort;
    private int servletPort;
+    private String messagingHostname;
+    private String exchangeName;
    ReplicationMasterDTO() {}
-    public ReplicationMasterDTO(String hostname, int messagingPort, int servletPort) {
+    public ReplicationMasterDTO(String hostname, int servletPort, String messagingHostname, int messagingPort, String exchangeName) {
        super();
        this.hostname = hostname;
-        this.messagingPort = messagingPort;
        this.servletPort = servletPort;
+        this.messagingHostname = messagingHostname;
+        this.messagingPort = messagingPort;
+        this.exchangeName = exchangeName;
    }
    public String getHostname() {
        return hostname;
@@ -22,4 +26,10 @@ public class ReplicationMasterDTO implements IsSerializable {
    public int getServletPort() {
        return servletPort;
    }
+    public String getMessagingHostname() {
+        return messagingHostname;
+    }
+    public String getExchangeName() {
+        return exchangeName;
+    }
 }
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages_de.properties=UTF-8
+encoding//src/main/java/com/sap/sse/security/ui/servlet/RedirectServlet.java=utf-8