Skip to content

Commit c72f731

Browse files
robywwrobyww
committed
Release 2020.3.2: document updates and patches
 - fixed: now using https for DSS and SDSS Bug Fix: SDSS and DSS need now use https more
1 parent 5228eaa commit c72f731

File tree

5 files changed

+33
-58
lines changed

5 files changed

+33
-58
lines changed

‎config/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//---------------------------------------------
44
BuildMajor = 2020
55
BuildMinor = 3
6-
BuildRev = 2
6+
BuildRev = 3
77
BuildNumber = 0
88
BuildType = "Final"
99

‎docs/release-notes.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
# Releases
88

99
### Version 2020.3
10+
- 2020.3.3 (December 2020)
11+
- docker tag: `latest`, `release-2020.3.3`, `release-2020.3`
1012
- 2020.3.2 (December 2020)
11-
- docker tag: `latest`, `release-2020.3.2`, `release-2020.3`
13+
- docker tag: `release-2020.3.2`
1214
- 2020.3.1 (October 2020)
1315
- docker tag: `release-2020.3.1`
1416
- patch #1 (see [patches](#patches-20203))
@@ -35,6 +37,8 @@
3537
- Predefined Cell renders ([Firefly-574](https://github.com/Caltech-IPAC/firefly/pull/1015))
3638

3739
##### _Patches 2020.3_
40+
- 2020.3.3
41+
- Fixed: for DSS and SDSS now using the `https` server
3842
- 2020.3.2
3943
- Fixed: regression bug with [Firefly-523](https://github.com/Caltech-IPAC/firefly/pull/955)
4044
- Fixed: small logging cleanup fix

‎src/firefly/java/edu/caltech/ipac/util/download/NetworkManager.java‎

Lines changed: 25 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -14,73 +14,44 @@
1414
*/
1515
public class NetworkManager {
1616

17-
public static final String MISSION_SERVER = "MissionServer";
18-
public static final String MISSION_SECURE_SERVER = "MissionSecureServer";
19-
public static final String NED_SERVER = "NEDServer";
20-
public static final String NED_NAME_RESOLVER = "NEDNameResolver";
21-
public static final String SIMBAD_NAME_RESOLVER = "SimbadNameResolver";
22-
public static final String SIMBAD4_NAME_RESOLVER = "Simbad4NameResolver";
23-
public static final String DSS_SERVER = "DSSServer";
24-
public static final String ISO_SERVER = "IsoServer";
25-
public static final String EPHEMERIS_PAIR_SERVER = "EphemerisPairServer";
26-
public static final String SKYVIEW_SERVER = "SkyviewServer";
27-
public static final String HEASARC_SERVER = "HeasarcServer";
28-
public static final String VIZIER_SERVER = "VizierServer";
29-
public static final String AUTO_UPDATE_SERVER = "AutoUpdateServer";
30-
public static final String IRSA = "IRSA";
31-
public static final String SPIZTER_POPULAR = "SpitzerPopular";
32-
public static final String SPITZER_ARCHIVE = "SpitzerArchive";
33-
public static final String HORIZONS_NAIF = "HorizonsNaif";
34-
public static final String SDSS_SERVER = "SDSSServer";
35-
36-
37-
private static NetworkManager _theInstance= null;
38-
private Map<String,HostPort> _servers = new HashMap<String,HostPort>(23);
39-
40-
protected NetworkManager() {
41-
42-
43-
addServerWithProp(MISSION_SERVER, "soas.ipac.caltech.edu", 80 );
44-
addServerWithProp(NED_SERVER, "ned.ipac.caltech.edu", 443);
45-
addServerWithProp(SIMBAD_NAME_RESOLVER, "simbad.harvard.edu", 80);
46-
addServerWithProp(SIMBAD4_NAME_RESOLVER,"simbad.u-strasbg.fr", 80);
47-
addServerWithProp(DSS_SERVER, "archive.stsci.edu", 80);
48-
//addServerWithProp(ISO_SERVER, "pma.iso.vilspa.esa.es", 8080);
49-
addServerWithProp(ISO_SERVER, "ida.esac.esa.int", 8080);
50-
addServerWithProp(EPHEMERIS_PAIR_SERVER,"soas.ipac.caltech.edu", 80);
51-
addServerWithProp(SKYVIEW_SERVER, "skys.gsfc.nasa.gov", 80);
52-
addServerWithProp(HEASARC_SERVER, "heasarc.gsfc.nasa.gov", 80);
53-
addServerWithProp(VIZIER_SERVER, "vizier.u-strasbg.fr", 80);
54-
addServerWithProp(IRSA, "irsa.ipac.caltech.edu", 443);
55-
addServerWithProp(AUTO_UPDATE_SERVER, "soas.ipac.caltech.edu", 80);
56-
addServerWithProp(SPITZER_ARCHIVE, "archive.spitzer.caltech.edu",80);
57-
addServerWithProp(SPIZTER_POPULAR, "data.spitzer.caltech.edu",80);
58-
addServerWithProp(HORIZONS_NAIF, "ssd.jpl.nasa.gov" ,443);
59-
addServerWithProp(SDSS_SERVER, "cas.sdss.org" ,80);
60-
}
17+
public static final String NED_SERVER = "NEDServer";
18+
public static final String DSS_SERVER = "DSSServer";
19+
public static final String IRSA = "IRSA";
20+
public static final String HORIZONS_NAIF = "HorizonsNaif";
21+
public static final String SDSS_SERVER = "SDSSServer";
22+
23+
private static NetworkManager _theInstance= null;
24+
private Map<String,HostPort> _servers = new HashMap<String,HostPort>(23);
25+
26+
protected NetworkManager() {
27+
addServerWithProp(NED_SERVER, "ned.ipac.caltech.edu", 443);
28+
addServerWithProp(DSS_SERVER, "archive.stsci.edu", 443);
29+
addServerWithProp(IRSA, "irsa.ipac.caltech.edu", 443);
30+
addServerWithProp(HORIZONS_NAIF, "ssd.jpl.nasa.gov", 443);
31+
addServerWithProp(SDSS_SERVER, "cas.sdss.org", 443);
32+
}
6133

62-
public static NetworkManager getInstance() {
63-
if (_theInstance == null) _theInstance= new NetworkManager();
64-
return _theInstance;
65-
}
34+
public static NetworkManager getInstance() {
35+
if (_theInstance == null) _theInstance= new NetworkManager();
36+
return _theInstance;
37+
}
6638

67-
public void addServer( String serverName, HostPort server) {
68-
_servers.put(serverName, server);
69-
}
39+
public void addServer( String serverName, HostPort server) {
40+
_servers.put(serverName, server);
41+
}
7042

71-
public HostPort getServer(String serverName) { return _servers.get(serverName); }
43+
public HostPort getServer(String serverName) { return _servers.get(serverName); }
7244

7345

7446
//===================================================================
7547
//-------------------------- Private / Protected Methods ------------
7648
//===================================================================
7749

7850
private void addServerWithProp(String serverName, String defaultHost, int defaultPort) {
79-
8051
String hostProp= "NetworkManager." + serverName + ".Host";
8152
String portProp= "NetworkManager." + serverName + ".Port";
8253
String host= AppProperties.getProperty(hostProp, defaultHost);
8354
int port= AppProperties.getIntProperty(portProp, defaultPort);
8455
addServer(serverName, new HostPort(host, port) );
8556
}
86-
}
57+
}

‎src/firefly/java/edu/caltech/ipac/visualize/net/DssImageGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static String makeDssRequest(HostPort server,
7272
String cgiapp,
7373
DssImageParams params) {
7474
String retval;
75-
retval= "http://" +
75+
retval= "https://" +
7676
server.getHost() + ":" + server.getPort() + cgiapp +
7777
"?r=" + params.getRaJ2000String() +
7878
"&d=" + params.getDecJ2000String() +

‎src/firefly/java/edu/caltech/ipac/visualize/net/SloanDssImageGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private static String makeSDssRequest(HostPort server,
8383
String cgiapp,
8484
SloanDssImageParams params) {
8585
String retval;
86-
retval = "http://" + server.getHost() + ":" + server.getPort() + cgiapp +
86+
retval = "https://" + server.getHost() + ":" + server.getPort() + cgiapp +
8787
"?POS=" + params.getRaJ2000String() + "," + params.getDecJ2000String() +
8888
"&size=" + params.getSizeInDeg() +
8989
"&bandpass=" + params.getBand().toString().toLowerCase() +

0 commit comments

Comments
 (0)