Revision 0eca8a54
Added by Andreas Kohlbecker about 8 years ago
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java | ||
---|---|---|
48 | 48 |
public class CdmServerInfo { |
49 | 49 |
public static final Logger logger = Logger.getLogger(CdmServerInfo.class); |
50 | 50 |
|
51 |
private final static String CDMSERVER_PREFIX = ""; |
|
51 |
private final static String CDMSERVER_PREFIX = "cdmserver/";
|
|
52 | 52 |
private final static String NAME_PRODUCTION = "cybertaxonomy.org"; |
53 | 53 |
private final static String SERVER_PRODUCTION = "api.cybertaxonomy.org"; |
54 | 54 |
|
... | ... | |
88 | 88 |
private String cdmlibServicesVersion = ""; |
89 | 89 |
private String cdmlibServicesLastModified = ""; |
90 | 90 |
|
91 |
private String prefix = ""; |
|
91 | 92 |
|
92 |
public CdmServerInfo(String name, String server, int port) { |
|
93 |
private boolean ignoreCdmLibVersion = false; |
|
94 |
|
|
95 |
|
|
96 |
public CdmServerInfo(String name, String server, int port, String prefix, boolean ignoreCdmLibVersion) { |
|
93 | 97 |
this.name = name; |
94 | 98 |
this.server = server; |
95 | 99 |
this.port = port; |
100 |
this.prefix = prefix; |
|
101 |
this.ignoreCdmLibVersion = ignoreCdmLibVersion; |
|
96 | 102 |
instances = new ArrayList<CdmInstanceInfo>(); |
97 | 103 |
|
98 | 104 |
} |
... | ... | |
142 | 148 |
} |
143 | 149 |
|
144 | 150 |
public void updateInfo() throws CDMServerException { |
145 |
String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/info.jsp";
|
|
151 |
String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "info.jsp";
|
|
146 | 152 |
String responseBody = getResponse(url); |
147 | 153 |
if(responseBody != null) { |
148 | 154 |
try { |
... | ... | |
157 | 163 |
|
158 | 164 |
public void addInstancesViaHttp() throws CDMServerException { |
159 | 165 |
updateInfo(); |
160 |
String url = "http://" + server + ":" + String.valueOf(port) + "/" + CDMSERVER_PREFIX + "/instances.jsp";
|
|
166 |
String url = "http://" + server + ":" + String.valueOf(port) + "/" + prefix + "instances.jsp";
|
|
161 | 167 |
String responseBody = getResponse(url); |
162 | 168 |
if(responseBody != null) { |
163 | 169 |
try { |
... | ... | |
310 | 316 |
|
311 | 317 |
String serverVersion = cdmlibServicesVersion; |
312 | 318 |
String serverCdmlibLastModified = cdmlibServicesLastModified; |
313 |
|
|
314 |
return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified); |
|
319 |
if(ignoreCdmLibVersion) { |
|
320 |
return 0; |
|
321 |
} else { |
|
322 |
return compareCdmlibServicesVersion(serverVersion, serverCdmlibLastModified); |
|
323 |
} |
|
315 | 324 |
} |
316 | 325 |
|
317 | 326 |
|
... | ... | |
369 | 378 |
|
370 | 379 |
public static List<CdmServerInfo> getCdmServers() { |
371 | 380 |
if(cdmServerInfoList == null) { |
372 |
cdmServerInfoList = new ArrayList<CdmServerInfo>();
|
|
373 |
// cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
|
|
374 |
//cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
|
|
375 |
cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80));
|
|
376 |
// cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80)); |
|
377 |
cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80)); |
|
378 |
cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
|
|
379 |
cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,NULL_PORT));
|
|
381 |
cdmServerInfoList = new ArrayList<CdmServerInfo>(); |
|
382 |
// cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, ""));
|
|
383 |
//cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
|
|
384 |
cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
|
|
385 |
// cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
|
|
386 |
cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
|
|
387 |
cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
|
|
388 |
cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false));
|
|
380 | 389 |
} |
381 | 390 |
return cdmServerInfoList; |
382 | 391 |
} |
... | ... | |
411 | 420 |
CdmInstanceInfo devInstance = null; |
412 | 421 |
if(value != null && !value.isEmpty()) { |
413 | 422 |
int devPort = Integer.valueOf(value); |
414 |
CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort); |
|
423 |
CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort, "", false);
|
|
415 | 424 |
try { |
416 | 425 |
devInstance = devCii.addInstance(NAME_INSTANCE_LOCALHOST_DEV, BASEPATH_LOCALHOST_DEV); |
417 | 426 |
available = devCii.pingInstance(devInstance, devPort); |
Also available in: Unified diff
flexible server path prefix and option skip cdmlib version test per server