Project

General

Profile

« Previous | Next » 

Revision 48139

integrated (hopefully) all required changes from dnet40

View differences:

PrepareIISParamsV2.java
51 51

  
52 52
	private String islookupLocationParam = "import_islookup_service_location";
53 53

  
54
	private String importProjectConceptsContextIdParam = "import_project_concepts_context_id";
54
	private String importProjectConceptsContextCSVParam = "import_project_concepts_context_ids_csv";
55 55

  
56
	private String importProjectConceptsContextId;
56
	private String importProjectConceptsContextCSV;
57 57

  
58 58
	private String xqueryDatasetStore;
59 59

  
......
61 61

  
62 62
	private String objectStoreBlacklistCSV = "";
63 63

  
64
	//private String importHbaseDumpLocationParam = "import_hbase_dump_location";
65

  
66
	//private String importHbaseDumpLocation;
67

  
68 64
	protected void prepare(final NodeToken token) throws Exception {
69 65

  
70 66
		token.getEnv().setAttribute(getClusterParam(), getClusterName());
......
75 71
		token.getEnv().setAttribute(getObjectStoreLocationParam(), getServiceEndpoint(getXqueryObjectStoreService()));
76 72

  
77 73
		token.getEnv().setAttribute(getIslookupLocationParam(), getServiceEndpoint(getXqueryIsLookupService()));
78
		token.getEnv().setAttribute(getImportProjectConceptsContextIdParam(), getImportProjectConceptsContextId());
74
		token.getEnv().setAttribute(getImportProjectConceptsContextCSVParam(), getImportProjectConceptsContextCSV());
79 75

  
80
		//Configuration dmConf = configurationEnumerator.get(ClusterName.DM);
81
		//String dmNameNode = dmConf.get("fs.defaultFS");
82
		//token.getEnv().setAttribute(getImportHbaseDumpLocationParam(), getURI(dmNameNode, getImportHbaseDumpLocation()));
83

  
84 76
		Configuration conf = configurationEnumerator.get(ClusterName.valueOf(getClusterName()));
85 77
		String nameNode = conf.get("fs.defaultFS");
86 78

  
......
261 253
		this.islookupLocationParam = islookupLocationParam;
262 254
	}
263 255

  
264
	public String getImportProjectConceptsContextIdParam() {
265
		return importProjectConceptsContextIdParam;
256
	public String getImportProjectConceptsContextCSVParam() {
257
		return importProjectConceptsContextCSVParam;
266 258
	}
267 259

  
268
	public void setImportProjectConceptsContextIdParam(final String importProjectConceptsContextIdParam) {
269
		this.importProjectConceptsContextIdParam = importProjectConceptsContextIdParam;
260
	public void setImportProjectConceptsContextCSVParam(final String importProjectConceptsContextCSVParam) {
261
		this.importProjectConceptsContextCSVParam = importProjectConceptsContextCSVParam;
270 262
	}
271 263

  
272
	public String getImportProjectConceptsContextId() {
273
		return importProjectConceptsContextId;
264
	public String getImportProjectConceptsContextCSV() {
265
		return importProjectConceptsContextCSV;
274 266
	}
275 267

  
276
	public void setImportProjectConceptsContextId(final String importProjectConceptsContextId) {
277
		this.importProjectConceptsContextId = importProjectConceptsContextId;
268
	public void setImportProjectConceptsContextCSV(final String importProjectConceptsContextCSV) {
269
		this.importProjectConceptsContextCSV = importProjectConceptsContextCSV;
278 270
	}
279

  
280
	/*
281
	public String getImportHbaseDumpLocationParam() {
282
		return importHbaseDumpLocationParam;
283
	}
284

  
285
	public void setImportHbaseDumpLocationParam(final String importHbaseDumpLocationParam) {
286
		this.importHbaseDumpLocationParam = importHbaseDumpLocationParam;
287
	}
288

  
289
	public String getImportHbaseDumpLocation() {
290
		return importHbaseDumpLocation;
291
	}
292

  
293
	public void setImportHbaseDumpLocation(final String importHbaseDumpLocation) {
294
		this.importHbaseDumpLocation = importHbaseDumpLocation;
295
	}
296

  
297
	*/
298 271
}

Also available in: Unified diff