Project

General

Profile

« Previous | Next » 

Revision 4698

Added by daigle over 15 years ago

Renamed MetaCatUtil to MetacatUtil

View differences:

ForceReplicationHandler.java
40 40
import org.apache.log4j.Logger;
41 41

  
42 42
import edu.ucsb.nceas.metacat.service.PropertyService;
43
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
43
import edu.ucsb.nceas.metacat.util.MetacatUtil;
44 44

  
45 45
/**
46 46
 * A class to asyncronously force the replication of each server
......
189 189
										+ server);
190 190
								comeAndGetIt = new URL("https://" + server
191 191
										+ "?action=forcereplicate&server="
192
										+ MetaCatUtil.getLocalReplicationServerName()
192
										+ MetacatUtil.getLocalReplicationServerName()
193 193
										+ "&docid=" + docid + "&dbaction=" + action);
194 194
								//over write the url for delete
195 195
								if (action != null && action.equals(DELETE)) {
......
197 197
											+ "?action="
198 198
											+ MetacatReplication.FORCEREPLICATEDELETE
199 199
											+ "&docid=" + docid + "&server="
200
											+ MetaCatUtil.getLocalReplicationServerName());
200
											+ MetacatUtil.getLocalReplicationServerName());
201 201

  
202 202
								}
203 203
							}//if servercode==1
......
211 211
										+ server);
212 212
								comeAndGetIt = new URL("https://" + server
213 213
										+ "?action=forcereplicate&server="
214
										+ MetaCatUtil.getLocalReplicationServerName()
214
										+ MetacatUtil.getLocalReplicationServerName()
215 215
										+ "&docid=" + docid + "&dbaction=" + action);
216 216
								//over write the url for delete
217 217
								if (action != null && action.equals(DELETE)) {
......
219 219
											+ "?action="
220 220
											+ MetacatReplication.FORCEREPLICATEDELETE
221 221
											+ "&docid=" + docid + "&server="
222
											+ MetaCatUtil.getLocalReplicationServerName());
222
											+ MetacatUtil.getLocalReplicationServerName());
223 223

  
224 224
								}
225 225
							}//else
......
233 233
										+ server);
234 234
								comeAndGetIt = new URL("https://" + server
235 235
										+ "?action=forcereplicatedatafile&server="
236
										+ MetaCatUtil.getLocalReplicationServerName()
236
										+ MetacatUtil.getLocalReplicationServerName()
237 237
										+ "&docid=" + docid + "&dbaction=" + action);
238 238
								//over write the url for delete
239 239
								if (action != null && action.equals(DELETE)) {
......
241 241
											+ "?action="
242 242
											+ MetacatReplication.FORCEREPLICATEDELETE
243 243
											+ "&docid=" + docid + "&server="
244
											+ MetaCatUtil.getLocalReplicationServerName());
244
											+ MetacatUtil.getLocalReplicationServerName());
245 245

  
246 246
								}
247 247

  
......
256 256
										+ server);
257 257
								comeAndGetIt = new URL("https://" + server
258 258
										+ "?action=forcereplicatedatafile&server="
259
										+ MetaCatUtil.getLocalReplicationServerName()
259
										+ MetacatUtil.getLocalReplicationServerName()
260 260
										+ "&docid=" + docid + "&dbaction=" + action);
261 261
								//over write the url for delete
262 262
								if (action != null && action.equals(DELETE)) {
......
264 264
											+ "?action="
265 265
											+ MetacatReplication.FORCEREPLICATEDELETE
266 266
											+ "&docid=" + docid + "&server="
267
											+ MetaCatUtil.getLocalReplicationServerName());
267
											+ MetacatUtil.getLocalReplicationServerName());
268 268

  
269 269
								}
270 270

  
......
282 282
							if (homeServerCode == 1) {
283 283
								comeAndGetIt = new URL("https://" + server
284 284
										+ "?action=forcereplicate&server="
285
										+ MetaCatUtil.getLocalReplicationServerName()
285
										+ MetacatUtil.getLocalReplicationServerName()
286 286
										+ "&docid=" + docid);
287 287

  
288 288
							}//if homeserver ==1
......
294 294
								// If the server is homeserver of the docid, replication it too
295 295
								comeAndGetIt = new URL("https://" + server
296 296
										+ "?action=forcereplicate&server="
297
										+ MetaCatUtil.getLocalReplicationServerName()
297
										+ MetacatUtil.getLocalReplicationServerName()
298 298
										+ "&docid=" + docid);
299 299

  
300 300
							}//else if
......
306 306
							if (homeServerCode == 1) {
307 307
								comeAndGetIt = new URL("https://" + server
308 308
										+ "?action=forcereplicatedatafile&server="
309
										+ MetaCatUtil.getLocalReplicationServerName()
309
										+ MetacatUtil.getLocalReplicationServerName()
310 310
										+ "&docid=" + docid);
311 311
							}//if
312 312
							else if (replicationServer.getHub()
......
317 317
								// If the server is homeserver of the docid, replication it too
318 318
								comeAndGetIt = new URL("https://" + server
319 319
										+ "?action=forcereplicatedatafile&server="
320
										+ MetaCatUtil.getLocalReplicationServerName()
320
										+ MetacatUtil.getLocalReplicationServerName()
321 321
										+ "&docid=" + docid);
322 322

  
323 323
							}//else

Also available in: Unified diff