From d02f826d7be6dad43fa1e467465df9ee55244bc0 Mon Sep 17 00:00:00 2001 From: Renato Campos Date: Mon, 11 Feb 2019 16:12:37 +0000 Subject: [PATCH 1/5] pt.lsts.neptus.comm.iridium: RipplesIridiumMessenger: Update server to use the new ripples server. --- src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java b/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java index 1f8b68d5a8..318ad18daf 100644 --- a/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java +++ b/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java @@ -36,11 +36,11 @@ * @author zp * */ -@IridiumProvider(id="heroku", name="Heroku Messenger", description="Sends Iridium messages directly via heroku ripples app.") +@IridiumProvider(id="ripples", name="Ripples Messenger", description="Sends Iridium messages directly to ripples app.") public class RipplesIridiumMessenger extends HubIridiumMessenger { public RipplesIridiumMessenger() { - serverUrl = "http://ripples-spring.herokuapp.com/api/v1/"; + serverUrl = "http://104.248.168.40:9090/api/v1/"; } } From 32f525fa3d4b06cb73c49d276e469b882f7d90ed Mon Sep 17 00:00:00 2001 From: Renato Campos Date: Mon, 11 Feb 2019 16:19:50 +0000 Subject: [PATCH 2/5] pt.lsts.neptus.comm.iridium.IridiumManager: Update IridiumMessengerEnum. --- src/pt/lsts/neptus/comm/iridium/IridiumManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pt/lsts/neptus/comm/iridium/IridiumManager.java b/src/pt/lsts/neptus/comm/iridium/IridiumManager.java index 54df15538f..d2b36dc773 100644 --- a/src/pt/lsts/neptus/comm/iridium/IridiumManager.java +++ b/src/pt/lsts/neptus/comm/iridium/IridiumManager.java @@ -81,7 +81,7 @@ public enum IridiumMessengerEnum { RockBlockIridiumMessenger, HubIridiumMessenger, SimulatedMessenger, - HerokuMessenger + RipplesMessenger } private IridiumManager() { @@ -100,7 +100,7 @@ public IridiumMessenger getCurrentMessenger() { return hubMessenger; case RockBlockIridiumMessenger: return rockBlockMessenger; - case HerokuMessenger: + case RipplesMessenger: return ripplesMessenger; default: return simMessenger; From 856daff0ac1ed20d2f87da658d8573ccc124d1e6 Mon Sep 17 00:00:00 2001 From: ineeve Date: Wed, 8 May 2019 17:10:11 +0100 Subject: [PATCH 3/5] Update ripples iridium messenger server url --- src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java b/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java index 318ad18daf..4fd2a96592 100644 --- a/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java +++ b/src/pt/lsts/neptus/comm/iridium/RipplesIridiumMessenger.java @@ -40,7 +40,7 @@ public class RipplesIridiumMessenger extends HubIridiumMessenger { public RipplesIridiumMessenger() { - serverUrl = "http://104.248.168.40:9090/api/v1/"; + serverUrl = "http://falkor.lsts.pt:9090/api/v1/"; } } From 75c9a41cce4759704b8ec87802db54d278a71889 Mon Sep 17 00:00:00 2001 From: ineeve Date: Wed, 8 May 2019 18:58:45 +0100 Subject: [PATCH 4/5] pt.lsts.neptus.util.conf.GeneralPreferences: Add ripplesUrl. --- plugins-dev/cloud/pt/lsts/ripples/RipplesPositions.java | 3 ++- plugins-dev/cloud/pt/lsts/ripples/RipplesUpload.java | 2 +- .../pt/lsts/neptus/historicdata/HistoricWebAdapter.java | 5 +++-- .../soi/pt/lsts/neptus/endurance/EnduranceWebApi.java | 4 +++- .../plugins/sunfish/awareness/HubLocationProvider.java | 3 ++- .../neptus/plugins/sunfish/awareness/PositionHistory.java | 3 ++- src/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java | 3 ++- src/pt/lsts/neptus/comm/iridium/SimulatedMessenger.java | 3 ++- src/pt/lsts/neptus/util/conf/GeneralPreferences.java | 7 +++++++ 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/plugins-dev/cloud/pt/lsts/ripples/RipplesPositions.java b/plugins-dev/cloud/pt/lsts/ripples/RipplesPositions.java index 98f6dc62d9..a9a8ed74f9 100644 --- a/plugins-dev/cloud/pt/lsts/ripples/RipplesPositions.java +++ b/plugins-dev/cloud/pt/lsts/ripples/RipplesPositions.java @@ -65,6 +65,7 @@ import pt.lsts.neptus.types.coord.LocationType; import pt.lsts.neptus.util.DateTimeUtil; import pt.lsts.neptus.util.ImageUtils; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** * @author zp @@ -74,7 +75,7 @@ public class RipplesPositions extends ConsoleLayer { @NeptusProperty - String positionsApiUrl = "http://ripples.lsts.pt/positions"; + String positionsApiUrl = GeneralPreferences.ripplesUrl + "/positions"; ColorMap cmap = ColorMapFactory.createRedYellowGreenColorMap(); diff --git a/plugins-dev/cloud/pt/lsts/ripples/RipplesUpload.java b/plugins-dev/cloud/pt/lsts/ripples/RipplesUpload.java index f04bb66b44..0fdbceb01a 100644 --- a/plugins-dev/cloud/pt/lsts/ripples/RipplesUpload.java +++ b/plugins-dev/cloud/pt/lsts/ripples/RipplesUpload.java @@ -101,7 +101,7 @@ public class RipplesUpload extends ConsolePanel implements ConfigurationListener private static final long serialVersionUID = -8036937519999303108L; private final String firebasePath = "https://neptus.firebaseio.com/"; - private final String ripplesActiveSysUrl = "http://ripples.lsts.pt/api/v1/systems/active"; + private final String ripplesActiveSysUrl = GeneralPreferences.ripplesUrl + "/api/v1/systems/active"; private JCheckBoxMenuItem menuItem; private ImageIcon onIcon, offIcon; diff --git a/plugins-dev/historic-data/pt/lsts/neptus/historicdata/HistoricWebAdapter.java b/plugins-dev/historic-data/pt/lsts/neptus/historicdata/HistoricWebAdapter.java index 8adb966bdb..49566a4cf6 100644 --- a/plugins-dev/historic-data/pt/lsts/neptus/historicdata/HistoricWebAdapter.java +++ b/plugins-dev/historic-data/pt/lsts/neptus/historicdata/HistoricWebAdapter.java @@ -58,6 +58,7 @@ import pt.lsts.neptus.comm.manager.imc.ImcSystemsHolder; import pt.lsts.neptus.console.notifications.Notification; import pt.lsts.neptus.i18n.I18n; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** * @author zp @@ -66,8 +67,8 @@ public class HistoricWebAdapter { private ExecutorService executor = Executors.newSingleThreadExecutor(); - private String getURL = "http://ripples.lsts.pt/datastore/lsf"; - private String postURL = "http://ripples.lsts.pt/datastore"; + private String getURL = GeneralPreferences.ripplesUrl + "/datastore/lsf"; + private String postURL = GeneralPreferences.ripplesUrl + "/datastore"; private HttpClient client = new HttpClient(); private long lastPoll = System.currentTimeMillis() - 1200 * 1000; private HistoricDataInteraction interaction; diff --git a/plugins-dev/soi/pt/lsts/neptus/endurance/EnduranceWebApi.java b/plugins-dev/soi/pt/lsts/neptus/endurance/EnduranceWebApi.java index 52d9c904d0..bdc0a3da0e 100644 --- a/plugins-dev/soi/pt/lsts/neptus/endurance/EnduranceWebApi.java +++ b/plugins-dev/soi/pt/lsts/neptus/endurance/EnduranceWebApi.java @@ -49,9 +49,11 @@ import com.eclipsesource.json.Json; import com.eclipsesource.json.JsonObject; +import pt.lsts.neptus.util.conf.GeneralPreferences; + public class EnduranceWebApi { - private static final String SOI_URL_DEFAULT = "http://ripples.lsts.pt/soi"; + private static final String SOI_URL_DEFAULT = GeneralPreferences.ripplesUrl + "/soi"; private static String soiUrl = SOI_URL_DEFAULT; diff --git a/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/HubLocationProvider.java b/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/HubLocationProvider.java index 3aeb56e4ae..33e39690de 100644 --- a/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/HubLocationProvider.java +++ b/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/HubLocationProvider.java @@ -47,6 +47,7 @@ import pt.lsts.neptus.comm.iridium.HubIridiumMessenger.HubSystemMsg; import pt.lsts.neptus.console.notifications.Notification; import pt.lsts.neptus.plugins.update.Periodic; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** @@ -56,7 +57,7 @@ public class HubLocationProvider implements ILocationProvider { SituationAwareness parent; - private String systemsUrl = "http://ripples.lsts.pt/api/v1/systems/active"; + private String systemsUrl = GeneralPreferences.ripplesUrl + "/api/v1/systems/active"; @Override public void onInit(SituationAwareness instance) { this.parent = instance; diff --git a/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/PositionHistory.java b/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/PositionHistory.java index 53bb06c800..05fbe6247c 100644 --- a/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/PositionHistory.java +++ b/plugins-dev/sunfish/pt/lsts/neptus/plugins/sunfish/awareness/PositionHistory.java @@ -45,6 +45,7 @@ import org.apache.commons.io.FileUtils; import pt.lsts.neptus.NeptusLog; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** * @author zp @@ -52,7 +53,7 @@ */ public class PositionHistory { - private static final String positions_url = "http://ripples.lsts.pt/api/v1/csvTag/"; + private static final String positions_url = GeneralPreferences.ripplesUrl + "/api/v1/csvTag/"; private static DateFormat fmt2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public static void downloadCsv(String day, boolean force) throws Exception { diff --git a/src/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java b/src/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java index a871adf6a4..4815d77471 100644 --- a/src/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java +++ b/src/pt/lsts/neptus/comm/iridium/HubIridiumMessenger.java @@ -57,6 +57,7 @@ import pt.lsts.neptus.NeptusLog; import pt.lsts.neptus.comm.iridium.Position.PosType; import pt.lsts.neptus.util.ByteUtil; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** * @author zp @@ -66,7 +67,7 @@ public class HubIridiumMessenger implements IridiumMessenger { protected boolean available = true; - protected String serverUrl = "http://ripples.lsts.pt/api/v1/"; + protected String serverUrl = GeneralPreferences.ripplesUrl + "/api/v1/"; // protected String serverUrl = "http://lsts-hub/api/v1/"; protected String systemsUrl = serverUrl+"systems"; protected String activeSystemsUrl = systemsUrl+"/active"; diff --git a/src/pt/lsts/neptus/comm/iridium/SimulatedMessenger.java b/src/pt/lsts/neptus/comm/iridium/SimulatedMessenger.java index fae647a537..55c1d57db1 100644 --- a/src/pt/lsts/neptus/comm/iridium/SimulatedMessenger.java +++ b/src/pt/lsts/neptus/comm/iridium/SimulatedMessenger.java @@ -50,6 +50,7 @@ import pt.lsts.imc.IridiumMsgTx; import pt.lsts.neptus.NeptusLog; import pt.lsts.neptus.comm.manager.imc.ImcMsgManager; +import pt.lsts.neptus.util.conf.GeneralPreferences; /** * @author zp @@ -63,7 +64,7 @@ public class SimulatedMessenger implements IridiumMessenger { protected HashSet listeners = new HashSet<>(); - protected String serverUrl = "http://ripples.lsts.pt/api/v1/"; + protected String serverUrl = GeneralPreferences.ripplesUrl + "/api/v1/"; protected String messagesUrl = serverUrl+"irsim"; protected int timeoutMillis = 10000; diff --git a/src/pt/lsts/neptus/util/conf/GeneralPreferences.java b/src/pt/lsts/neptus/util/conf/GeneralPreferences.java index f2b88d042b..b216b1db92 100644 --- a/src/pt/lsts/neptus/util/conf/GeneralPreferences.java +++ b/src/pt/lsts/neptus/util/conf/GeneralPreferences.java @@ -260,6 +260,13 @@ public class GeneralPreferences implements PropertiesProvider { description = "Select this if you want also to show local time on console status bar.") public static boolean localTimeOnConsoleOn = false; + // ------------------------------------------------------------------------- + + @NeptusProperty(name = "Iridium Messenger", category="Iridium Communications", userLevel = LEVEL.REGULAR, + description = "Iridium messaging implementation") + public static String ripplesUrl = "http://ripples.lsts.pt"; + + // ------------------------------------------------------------------------- // Constructor and initialize From d51aa3fab5825d30fe450aa9e1aa59830a9dbfca Mon Sep 17 00:00:00 2001 From: ineeve Date: Wed, 8 May 2019 19:03:52 +0100 Subject: [PATCH 5/5] Update ripplesUrl annotation property --- src/pt/lsts/neptus/util/conf/GeneralPreferences.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pt/lsts/neptus/util/conf/GeneralPreferences.java b/src/pt/lsts/neptus/util/conf/GeneralPreferences.java index b216b1db92..71a97b1482 100644 --- a/src/pt/lsts/neptus/util/conf/GeneralPreferences.java +++ b/src/pt/lsts/neptus/util/conf/GeneralPreferences.java @@ -262,8 +262,8 @@ public class GeneralPreferences implements PropertiesProvider { // ------------------------------------------------------------------------- - @NeptusProperty(name = "Iridium Messenger", category="Iridium Communications", userLevel = LEVEL.REGULAR, - description = "Iridium messaging implementation") + @NeptusProperty(name = "Ripples URL", category="Iridium Communications", userLevel = LEVEL.REGULAR, + description = "URL of the ripples web server") public static String ripplesUrl = "http://ripples.lsts.pt";