Project

General

Profile

« Previous | Next » 

Revision 39151

Added by Marek Horst over 8 years ago

merging trunk changes with IIS-CDH-5.3.0 branch

View differences:

modules/icm-iis-common/branches/IIS-CDH-5.3.0/log.txt
1
------------------------------------------------------------------------
2
r37878 | marek.horst | 2015-06-19 15:45:51 +0200 (Fri, 19 Jun 2015) | 1 line
3

  
4
merging trunk changes with IIS-CDH-5.3.0 branch
5
------------------------------------------------------------------------
6
r37152 | marek.horst | 2015-05-11 19:46:15 +0200 (Mon, 11 May 2015) | 1 line
7

  
8
fixing module and parent version to 1.0.1-CDH-5.3.0-SNAPSHOT
9
------------------------------------------------------------------------
10
r36940 | marek.horst | 2015-05-05 18:26:22 +0200 (Tue, 05 May 2015) | 1 line
11

  
12
merging trunk changes with IIS-CDH-5.3.0 branch
13
------------------------------------------------------------------------
14
r35267 | marek.horst | 2015-03-11 17:02:33 +0100 (Wed, 11 Mar 2015) | 1 line
15

  
16
creating IIS-CDH-5.3.0 branch
17
------------------------------------------------------------------------
18
r34625 | marek.horst | 2015-02-19 18:12:25 +0100 (Thu, 19 Feb 2015) | 1 line
19

  
20
#1038 introducing ranges in dependencies definition for all IIS modules
21
------------------------------------------------------------------------
22
r34584 | marek.horst | 2015-02-18 18:50:28 +0100 (Wed, 18 Feb 2015) | 1 line
23

  
24
#1038 reintroducing ranges in dependencies definition for all non-iis dnet modules
25
------------------------------------------------------------------------
26
r33532 | marek.horst | 2014-12-15 20:47:54 +0100 (Mon, 15 Dec 2014) | 1 line
27

  
28
[maven-release-plugin] prepare for next development iteration
29
------------------------------------------------------------------------
30
r33530 | marek.horst | 2014-12-15 20:47:51 +0100 (Mon, 15 Dec 2014) | 1 line
31

  
32
[maven-release-plugin] prepare release icm-iis-common-1.0.0
33
------------------------------------------------------------------------
34
r33529 | marek.horst | 2014-12-15 20:47:26 +0100 (Mon, 15 Dec 2014) | 1 line
35

  
36
#1044 pre-release switching to released version of parent pom and released dependencies
37
------------------------------------------------------------------------
38
r33409 | marek.horst | 2014-12-15 12:41:22 +0100 (Mon, 15 Dec 2014) | 1 line
39

  
40
introducing scm definition
41
------------------------------------------------------------------------
42
r33401 | marek.horst | 2014-12-15 12:27:25 +0100 (Mon, 15 Dec 2014) | 1 line
43

  
44
#1038 upgrading dnet dependencies to latest released versions listed by Claudio in #1038#note-3
45
------------------------------------------------------------------------
46
r31695 | marek.horst | 2014-10-24 14:55:13 +0200 (Fri, 24 Oct 2014) | 1 line
47

  
48
renaming import.content.max.file.size workflow input parameter to import.content.max.file.size.mb
49
------------------------------------------------------------------------
50
r31694 | marek.horst | 2014-10-24 14:52:43 +0200 (Fri, 24 Oct 2014) | 1 line
51

  
52
introducing import.content.max.file.size workflow input parameter
53
------------------------------------------------------------------------
54
r31419 | marek.horst | 2014-10-17 12:24:52 +0200 (Fri, 17 Oct 2014) | 1 line
55

  
56
#883 introducing import.content.blacklisted.objectstores.csv property
57
------------------------------------------------------------------------
58
r31261 | marek.horst | 2014-10-10 12:11:22 +0200 (Fri, 10 Oct 2014) | 1 line
59

  
60
introducing IMPORT_MERGE_BODY_WITH_UPDATES flag. When set Oaf retrieved from body should be merged with all available updates holding inferred content
61
------------------------------------------------------------------------
62
r31249 | marek.horst | 2014-10-09 15:33:11 +0200 (Thu, 09 Oct 2014) | 1 line
63

  
64
introducing regex support in result approver to support iis::* kind of provenance, updating workflow definitions with proper regex values
65
------------------------------------------------------------------------
66
r31162 | marek.horst | 2014-10-06 17:44:08 +0200 (Mon, 06 Oct 2014) | 1 line
67

  
68
#637 introducing vocabulary related import parameters
69
------------------------------------------------------------------------
70
r31025 | marek.horst | 2014-10-02 13:26:21 +0200 (Thu, 02 Oct 2014) | 1 line
71

  
72
removing obsolete comment
73
------------------------------------------------------------------------
74
r31016 | marek.horst | 2014-10-02 11:56:54 +0200 (Thu, 02 Oct 2014) | 1 line
75

  
76
#433 fixing problem with unserializable comparator: moving logic to comparable objects
77
------------------------------------------------------------------------
78
r30984 | marek.horst | 2014-10-01 18:23:57 +0200 (Wed, 01 Oct 2014) | 1 line
79

  
80
#433 introducing natural citations ordering
81
------------------------------------------------------------------------
82
r29824 | marek.horst | 2014-08-22 14:15:09 +0200 (Fri, 22 Aug 2014) | 1 line
83

  
84
introducing IMPORT_TRUST_LEVEL_THRESHOLD parameter
85
------------------------------------------------------------------------
86
r29809 | marek.horst | 2014-08-21 14:03:59 +0200 (Thu, 21 Aug 2014) | 1 line
87

  
88
introducing shared citation ExtraData XML model in icm-iis-common, implementing citation importer in mapred_import workflow, implementing exporter module
89
------------------------------------------------------------------------
90
r29806 | marek.horst | 2014-08-21 12:56:02 +0200 (Thu, 21 Aug 2014) | 1 line
91

  
92
introducing CONFIDENCE_TO_TRUST_LEVEL_FACTOR field holding 0.9 multiplier used for IIS confidence level [0;1] translation to trust level [0;0.9]
93
------------------------------------------------------------------------
94
r29070 | marek.horst | 2014-07-14 10:18:21 +0200 (Mon, 14 Jul 2014) | 1 line
95

  
96
introducing FsShellPermissions utility class, utilizing proprly working chmod in metadataextraction cache
97
------------------------------------------------------------------------
98
r28956 | marek.horst | 2014-07-08 17:18:03 +0200 (Tue, 08 Jul 2014) | 1 line
99

  
100
updating programatical execution of chmod on meta.json file, stil not working due to "Permission denied" warnings
101
------------------------------------------------------------------------
102
r28855 | marek.horst | 2014-07-02 20:00:10 +0200 (Wed, 02 Jul 2014) | 1 line
103

  
104
introducing changing meta.json file permission allowing writing for different users
105
------------------------------------------------------------------------
106
r28758 | marek.horst | 2014-07-01 16:45:49 +0200 (Tue, 01 Jul 2014) | 1 line
107

  
108
introducing deploy.info file for module icm-iis-common
109
------------------------------------------------------------------------
110
r28748 | marek.horst | 2014-07-01 16:16:57 +0200 (Tue, 01 Jul 2014) | 1 line
111

  
112
removing hacks required to work with dnet40 libs in dnet11 build system after moving sources from dnet11 to dnet40 and reconfiguring build system
113
------------------------------------------------------------------------
114
r28742 | marek.horst | 2014-07-01 14:35:30 +0200 (Tue, 01 Jul 2014) | 1 line
115

  
116
moving icm-iis-* modules from dnet11 to dnet40
117
------------------------------------------------------------------------
118
r28420 | marek.horst | 2014-06-24 12:46:12 +0200 (Tue, 24 Jun 2014) | 1 line
119

  
120
#486 introducing ConditionalPropertySetter module responsible for providing dynamic paths based on input parameter
121
------------------------------------------------------------------------
122
r28233 | marek.horst | 2014-06-16 15:23:46 +0200 (Mon, 16 Jun 2014) | 1 line
123

  
124
introducing inference provenance separator
125
------------------------------------------------------------------------
126
r28171 | marek.horst | 2014-06-12 11:51:10 +0200 (Thu, 12 Jun 2014) | 1 line
127

  
128
removing obsolete semantic classes constants
129
------------------------------------------------------------------------
130
r28148 | marek.horst | 2014-06-11 16:31:29 +0200 (Wed, 11 Jun 2014) | 1 line
131

  
132
introducing support for threshold runtime parameter in documentssimilarity exporter module
133
------------------------------------------------------------------------
134
r28143 | marek.horst | 2014-06-11 15:29:39 +0200 (Wed, 11 Jun 2014) | 1 line
135

  
136
#579 switching IIS to support 3.0.0-SNAPSHOT model version, updating importer and exporter modules
137
------------------------------------------------------------------------
138
r27997 | marek.horst | 2014-06-05 16:28:10 +0200 (Thu, 05 Jun 2014) | 1 line
139

  
140
updating SEMANTIC_SCHEME_DNET_CLASSIFICATION_TAXONOMIES value to dnet:subject_classification_typologies
141
------------------------------------------------------------------------
142
r27964 | marek.horst | 2014-06-04 14:13:13 +0200 (Wed, 04 Jun 2014) | 1 line
143

  
144
introducing CLASSIFICATION_HIERARCHY_SEPARATOR field
145
------------------------------------------------------------------------
146
r27959 | marek.horst | 2014-06-04 12:29:13 +0200 (Wed, 04 Jun 2014) | 1 line
147

  
148
introducing classification taxonomies labels
149
------------------------------------------------------------------------
150
r27607 | marek.horst | 2014-05-19 16:49:42 +0200 (Mon, 19 May 2014) | 1 line
151

  
152
#485 introducing support for multiple dataset identifiers passed to dataset importer and dataset entity exporter. Renaming properties names in workflow.xml and job.properties files.
153
------------------------------------------------------------------------
154
r27586 | marek.horst | 2014-05-19 12:40:49 +0200 (Mon, 19 May 2014) | 1 line
155

  
156
introducing similarity semantic class constants
157
------------------------------------------------------------------------
158
r26553 | marek.horst | 2014-04-11 17:41:32 +0200 (Fri, 11 Apr 2014) | 1 line
159

  
160
setting dnet-snapshots repository explicitly in pom.xml files of IIS modules after dropping it from shared spring4 dnet-parent
161
------------------------------------------------------------------------
162
r26515 | marek.horst | 2014-04-11 01:11:31 +0200 (Fri, 11 Apr 2014) | 1 line
163

  
164
#352 replacing fixed version value 1.7.4 with iis.avro.version placeholder defined in parent pom
165
------------------------------------------------------------------------
166
r26481 | marek.horst | 2014-04-10 19:20:28 +0200 (Thu, 10 Apr 2014) | 1 line
167

  
168
#349 make all IIS modules dnet-spring4 compliant: updating all pom.xml definitions with propert parent and updated dnet-spring4 SNAPSHOT dependencies. Updating java code by replacing IMDStoreService API with newly introduced MDStoreService API
169
------------------------------------------------------------------------
170
r26406 | marek.horst | 2014-04-07 15:54:05 +0200 (Mon, 07 Apr 2014) | 1 line
171

  
172
introducing import.hbase.remote.zookeeper.quorum and import.hbase.remote.zookeeper.clientport import parameters
173
------------------------------------------------------------------------
174
r26197 | marek.horst | 2014-03-28 17:51:35 +0100 (Fri, 28 Mar 2014) | 1 line
175

  
176
renaming EXPORT_ACTION_BUILDER_MODULE_CLASSNAME param to EXPORT_ACTION_BUILDER_FACTORY_CLASSNAME
177
------------------------------------------------------------------------
178
r26192 | marek.horst | 2014-03-28 15:09:15 +0100 (Fri, 28 Mar 2014) | 1 line
179

  
180
introducing EXPORT_ACTION_BUILDER_MODULE_CLASSNAME parameter
181
------------------------------------------------------------------------
182
r25923 | marek.horst | 2014-03-13 13:21:08 +0100 (Thu, 13 Mar 2014) | 1 line
183

  
184
major export refactoring: simplifying exporting modules by removing Puts processing and conversion to actions. Replacing it with direct AtomicAction creation. Major import refactoring: removing interators model, moving the remainings to import-content module.
185
------------------------------------------------------------------------
186
r25887 | marek.horst | 2014-03-12 12:26:50 +0100 (Wed, 12 Mar 2014) | 1 line
187

  
188
updating dnet-openaire-data-protos dependency from 1.6-SNAPSHOT to 1.7-SNAPSHOT
189
------------------------------------------------------------------------
190
r25838 | marek.horst | 2014-03-11 12:12:18 +0100 (Tue, 11 Mar 2014) | 1 line
191

  
192
fixing handling errors while creating cache: separating id generation from writing new id, removing temprorary cache dir when creating cache fails
193
------------------------------------------------------------------------
194
r25836 | marek.horst | 2014-03-11 12:07:07 +0100 (Tue, 11 Mar 2014) | 1 line
195

  
196
introducing lock managing process: obtains and releases specified lock using zookeeper
197
------------------------------------------------------------------------
198
r25702 | marek.horst | 2014-03-06 13:28:34 +0100 (Thu, 06 Mar 2014) | 1 line
199

  
200
introducing import.resultset.client.read.timeout property
201
------------------------------------------------------------------------
202
r25530 | marek.horst | 2014-03-03 13:30:03 +0100 (Mon, 03 Mar 2014) | 1 line
203

  
204
introducing utility method providing collumn family names for entity and relation types, changing returned type to byte[]
205
------------------------------------------------------------------------
206
r25528 | marek.horst | 2014-03-03 13:07:59 +0100 (Mon, 03 Mar 2014) | 1 line
207

  
208
introducing utility method providing collumn family names for entity and relation types
209
------------------------------------------------------------------------
210
r25508 | marek.horst | 2014-03-03 11:13:17 +0100 (Mon, 03 Mar 2014) | 1 line
211

  
212
switching dnet-openaire-data-protos dependency from 1.5 to 1.6-SNAPSHOT in order to introduce InformationSpace citation relation type
213
------------------------------------------------------------------------
214
r25374 | marek.horst | 2014-02-25 18:23:55 +0100 (Tue, 25 Feb 2014) | 1 line
215

  
216
changing dnet-openaire-data-protos dependency in icm-iis-common from 1.5-SNAPSHOT to released version 1.5, introducing statistics exporter module for document and person statistics in icm-iis-export-actionmanager
217
------------------------------------------------------------------------
218
r25371 | marek.horst | 2014-02-25 18:03:10 +0100 (Tue, 25 Feb 2014) | 1 line
219

  
220
introducing dedupRel definition
221
------------------------------------------------------------------------
222
r25222 | marek.horst | 2014-02-20 17:18:02 +0100 (Thu, 20 Feb 2014) | 1 line
223

  
224
switching dnet-openaire-data-protos version from 1.4 to 1.5-SNAPSHOT due to the changes in DocumentClasses protos
225
------------------------------------------------------------------------
226
r25220 | marek.horst | 2014-02-20 15:43:06 +0100 (Thu, 20 Feb 2014) | 1 line
227

  
228
code stabilization: switching dnet-openaire-data-protos version from 1.4-SNAPSHOT to 1.4
229
------------------------------------------------------------------------
230
r24584 | dominika.tkaczyk | 2014-02-03 14:52:32 +0100 (Mon, 03 Feb 2014) | 1 line
231

  
232
udfs deleted
233
------------------------------------------------------------------------
234
r24242 | marek.horst | 2014-01-21 17:01:49 +0100 (Tue, 21 Jan 2014) | 1 line
235

  
236
introducing actionset buckets refactoring: action set identifier can be provided explicitly as key=value property at runtime where key is algorithm name and value action set identifier
237
------------------------------------------------------------------------
238
r24154 | marek.horst | 2014-01-16 12:29:02 +0100 (Thu, 16 Jan 2014) | 1 line
239

  
240
introducing import.database.service.location and import.database.service.dbname parameters
241
------------------------------------------------------------------------
242
r24049 | marek.horst | 2014-01-13 17:51:39 +0100 (Mon, 13 Jan 2014) | 1 line
243

  
244
introducing import.content.object.store.ids.csv parameter
245
------------------------------------------------------------------------
246
r24023 | dominika.tkaczyk | 2014-01-13 13:03:47 +0100 (Mon, 13 Jan 2014) | 1 line
247

  
248
hive UDFs added
249
------------------------------------------------------------------------
250
r23959 | marek.horst | 2014-01-08 16:01:02 +0100 (Wed, 08 Jan 2014) | 1 line
251

  
252
introducing process verifying whether given datastore is empty
253
------------------------------------------------------------------------
254
r23949 | marek.horst | 2014-01-08 14:05:43 +0100 (Wed, 08 Jan 2014) | 1 line
255

  
256
introducing CacheMetadataManagingProcess: process module maintaining cache versioning, icm-iis-core required dependency added
257
------------------------------------------------------------------------
258
r23868 | marek.horst | 2013-12-30 16:54:42 +0100 (Mon, 30 Dec 2013) | 1 line
259

  
260
introducing import.content.objectstore.resultset.pagesize workflow parameter
261
------------------------------------------------------------------------
262
r23867 | marek.horst | 2013-12-30 15:27:55 +0100 (Mon, 30 Dec 2013) | 1 line
263

  
264
moving import.content.allow.duplicates from ContentRetriever to WorkflowRuntimeParameters
265
------------------------------------------------------------------------
266
r23866 | marek.horst | 2013-12-30 14:47:25 +0100 (Mon, 30 Dec 2013) | 1 line
267

  
268
introducing import.content.approved.objectstores.csv property
269
------------------------------------------------------------------------
270
r23224 | marek.horst | 2013-12-12 17:00:17 +0100 (Thu, 12 Dec 2013) | 1 line
271

  
272
introducing SEMANTIC_CLASS_INSTANCE_TYPE
273
------------------------------------------------------------------------
274
r22683 | marek.horst | 2013-12-03 17:24:03 +0100 (Tue, 03 Dec 2013) | 1 line
275

  
276
introducing EXPORT_ACTION_APPEND_ALGORITHM_SUFFIX parameter
277
------------------------------------------------------------------------
278
r22448 | mateusz.fedoryszak | 2013-11-26 15:51:11 +0100 (Tue, 26 Nov 2013) | 1 line
279

  
280
removing unnecessary lines
281
------------------------------------------------------------------------
282
r22445 | mateusz.fedoryszak | 2013-11-26 14:57:12 +0100 (Tue, 26 Nov 2013) | 1 line
283

  
284
Moving generic converter to common
285
------------------------------------------------------------------------
286
r22222 | marek.horst | 2013-11-15 18:44:00 +0100 (Fri, 15 Nov 2013) | 1 line
287

  
288
#131 removing plaintext export code
289
------------------------------------------------------------------------
290
r21843 | marek.horst | 2013-11-07 18:42:13 +0100 (Thu, 07 Nov 2013) | 1 line
291

  
292
updating dnet-openaire-data-protos version to the latest 1.4-SNAPSHOT
293
------------------------------------------------------------------------
294
r21775 | marek.horst | 2013-11-05 10:16:50 +0100 (Tue, 05 Nov 2013) | 1 line
295

  
296
introducing relation semantics related classes and schemas constants
297
------------------------------------------------------------------------
298
r21697 | marek.horst | 2013-10-31 18:17:05 +0100 (Thu, 31 Oct 2013) | 1 line
299

  
300
introducing SEMANTIC_CLASS_IIS
301
------------------------------------------------------------------------
302
r21681 | marek.horst | 2013-10-31 15:01:13 +0100 (Thu, 31 Oct 2013) | 1 line
303

  
304
introducing EXPORT_ENTITY_ACTION_SETID dedicated to entities export
305
------------------------------------------------------------------------
306
r21542 | marek.horst | 2013-10-24 18:22:46 +0200 (Thu, 24 Oct 2013) | 1 line
307

  
308
introducing document related workflow runtime parameters
309
------------------------------------------------------------------------
310
r21516 | marek.horst | 2013-10-24 12:07:27 +0200 (Thu, 24 Oct 2013) | 1 line
311

  
312
moving datacite MDStore related properties to WorkflowRuntimeParameters in order to share them with DatasetExporterProcess exporting MDStore datacite records to ActionManager
313
------------------------------------------------------------------------
314
r21437 | marek.horst | 2013-10-22 10:48:34 +0200 (Tue, 22 Oct 2013) | 1 line
315

  
316
introducing skip authors export flag
317
------------------------------------------------------------------------
318
r21337 | marek.horst | 2013-10-14 12:59:32 +0200 (Mon, 14 Oct 2013) | 1 line
319

  
320
introducing undefined non-empty value
321
------------------------------------------------------------------------
322
r21247 | marek.horst | 2013-10-09 15:15:19 +0200 (Wed, 09 Oct 2013) | 1 line
323

  
324
limiting number of content approver related parameters to absolute minimum
325
------------------------------------------------------------------------
326
r21246 | marek.horst | 2013-10-09 15:10:40 +0200 (Wed, 09 Oct 2013) | 1 line
327

  
328
introducing content approver related parameters
329
------------------------------------------------------------------------
330
r21079 | marek.horst | 2013-10-03 14:38:16 +0200 (Thu, 03 Oct 2013) | 1 line
331

  
332
Introducing new implementation of ObjectStoreContentProvider utilizing ISLookup for objectStore identifier retrieval based on repository id. Refactoring content provider service model to support repository-urls mappings required by new implementation of ObjectStore based content provider.
333
------------------------------------------------------------------------
334
r20626 | marek.horst | 2013-09-12 18:37:16 +0200 (Thu, 12 Sep 2013) | 1 line
335

  
336
introducing export.skip.original.metadata property
337
------------------------------------------------------------------------
338
r20504 | marek.horst | 2013-09-05 00:32:01 +0200 (Thu, 05 Sep 2013) | 1 line
339

  
340
adding missing cloudera repository
341
------------------------------------------------------------------------
342
r20414 | marek.horst | 2013-09-02 15:46:35 +0200 (Mon, 02 Sep 2013) | 1 line
343

  
344
fixing executed job checker: excluding current job
345
------------------------------------------------------------------------
346
r20318 | marek.horst | 2013-08-14 15:18:45 +0200 (Wed, 14 Aug 2013) | 1 line
347

  
348
introducing ExecutedJobChecker to verify whether given workflow is already being executed on cluster
349
------------------------------------------------------------------------
350
r20232 | marek.horst | 2013-08-05 15:30:04 +0200 (Mon, 05 Aug 2013) | 1 line
351

  
352
renaming content import related properties, introducing object store related properties
353
------------------------------------------------------------------------
354
r20024 | marek.horst | 2013-07-24 17:41:20 +0200 (Wed, 24 Jul 2013) | 1 line
355

  
356
introducing DEFAULT_CSV_DELIMITER
357
------------------------------------------------------------------------
358
r20023 | marek.horst | 2013-07-24 17:36:34 +0200 (Wed, 24 Jul 2013) | 1 line
359

  
360
introducing IMPORT_APPROVED_DATASOURCES_CSV entry
361
------------------------------------------------------------------------
362
r20015 | marek.horst | 2013-07-24 15:45:44 +0200 (Wed, 24 Jul 2013) | 1 line
363

  
364
introducing content import connection related properties
365
------------------------------------------------------------------------
366
r19830 | marek.horst | 2013-07-16 20:58:46 +0200 (Tue, 16 Jul 2013) | 1 line
367

  
368
updating dnet-openaire-data-protos SNAPSHOT version in order to use SpecialTrust value.
369
------------------------------------------------------------------------
370
r19818 | marek.horst | 2013-07-16 13:53:32 +0200 (Tue, 16 Jul 2013) | 1 line
371

  
372
removing obsolete HBase helper
373
------------------------------------------------------------------------
374
r19808 | marek.horst | 2013-07-15 17:27:10 +0200 (Mon, 15 Jul 2013) | 1 line
375

  
376
introducing action manager export related contstants
377
------------------------------------------------------------------------
378
r19635 | marek.horst | 2013-07-09 14:44:26 +0200 (Tue, 09 Jul 2013) | 1 line
379

  
380
introducing pid_types scheme id
381
------------------------------------------------------------------------
382
r19626 | marek.horst | 2013-07-09 12:13:13 +0200 (Tue, 09 Jul 2013) | 1 line
383

  
384
switching to 1.2-SNAPSHOT version of dnet-openaire-data-protos, reflecting changes: instance field instead of relation, inporting externalIdentifiers from Entity#pid field
385
------------------------------------------------------------------------
386
r19272 | marek.horst | 2013-06-24 18:05:17 +0200 (Mon, 24 Jun 2013) | 1 line
387

  
388
supporting external zookeeper localization to allow expoting data to external hbase instance
389
------------------------------------------------------------------------
390
r19223 | marek.horst | 2013-06-21 19:15:58 +0200 (Fri, 21 Jun 2013) | 1 line
391

  
392
setting missing 'abstract' class keyword
393
------------------------------------------------------------------------
394
r18714 | marek.horst | 2013-05-28 20:05:22 +0200 (Tue, 28 May 2013) | 1 line
395

  
396
introducing export.action.hbase.table.initialize property
397
------------------------------------------------------------------------
398
r18698 | marek.horst | 2013-05-28 15:07:39 +0200 (Tue, 28 May 2013) | 1 line
399

  
400
introducing EXPORT_HBASE_TABLE_INITIALIZE param
401
------------------------------------------------------------------------
402
r18655 | marek.horst | 2013-05-27 15:31:16 +0200 (Mon, 27 May 2013) | 1 line
403

  
404
replacing import.skip.inferred boolean property with import.inference.provenance.blacklist CSV
405
------------------------------------------------------------------------
406
r18654 | marek.horst | 2013-05-27 15:31:06 +0200 (Mon, 27 May 2013) | 1 line
407

  
408
updating row prefixes to most recent model
409
------------------------------------------------------------------------
410
r18608 | marek.horst | 2013-05-23 18:51:31 +0200 (Thu, 23 May 2013) | 1 line
411

  
412
fixed rowid prefixes, aligned to 1.2 protobuf IS model
413
------------------------------------------------------------------------
414
r18602 | marek.horst | 2013-05-23 16:10:26 +0200 (Thu, 23 May 2013) | 1 line
415

  
416
updating workflow runtime parameters
417
------------------------------------------------------------------------
418
r18488 | marek.horst | 2013-05-16 11:57:51 +0200 (Thu, 16 May 2013) | 1 line
419

  
420
ticking to dnet-openaire-data-protos version 1.1 to handle old protocol buffer model
421
------------------------------------------------------------------------
422
r18173 | marek.horst | 2013-04-19 18:08:24 +0200 (Fri, 19 Apr 2013) | 1 line
423

  
424
export model refactoring: separating action hbase and regular hbase properties, introducing RowExistanceVerifier as abstraction separating HBase calls from action manager based exporter, introducing action manager mapper abstraction
425
------------------------------------------------------------------------
426
r18064 | marek.horst | 2013-04-11 15:03:42 +0200 (Thu, 11 Apr 2013) | 1 line
427

  
428
minor model refactoring: replacing mulitple titles with single title, replacing array of TypedIdentifiers with map, renaming lang to language
429
------------------------------------------------------------------------
430
r18057 | marek.horst | 2013-04-10 18:04:28 +0200 (Wed, 10 Apr 2013) | 1 line
431

  
432
moving ImportMode enum to icm-iis-import
433
------------------------------------------------------------------------
434
r17989 | marek.horst | 2013-04-08 13:59:27 +0200 (Mon, 08 Apr 2013) | 1 line
435

  
436
simplifying lang type
437
------------------------------------------------------------------------
438
r17939 | marek.horst | 2013-04-04 17:38:47 +0200 (Thu, 04 Apr 2013) | 1 line
439

  
440
introducing EXPORT_HBASE_TABLE_NAME param
441
------------------------------------------------------------------------
442
r17935 | marek.horst | 2013-04-04 16:33:12 +0200 (Thu, 04 Apr 2013) | 1 line
443

  
444
introducing WorkflowRuntimeParameters holding all workflow related parameter names
445
------------------------------------------------------------------------
446
r17789 | marek.horst | 2013-03-26 18:57:35 +0100 (Tue, 26 Mar 2013) | 1 line
447

  
448
introducing byte array utils
449
------------------------------------------------------------------------
450
r17684 | marek.horst | 2013-03-20 18:13:29 +0100 (Wed, 20 Mar 2013) | 1 line
451

  
452
renaming dataset publication rels scheme
453
------------------------------------------------------------------------
454
r17682 | marek.horst | 2013-03-20 17:53:38 +0100 (Wed, 20 Mar 2013) | 1 line
455

  
456
Fixing citation relation handling, setting direction by specifying relation semantics to 'citing' or 'citedBy'
457
------------------------------------------------------------------------
458
r17568 | marek.horst | 2013-03-14 14:06:14 +0100 (Thu, 14 Mar 2013) | 1 line
459

  
460
major protobuf related refactoring: dropping all protocol buffer definitions from icm-iis-schemas, dropping metrics, classes and clusters related hbase collumn qualifiers, utilizing protocol buffers from dnet-openaire-data-protos, removing obsolete jdbc iterators, code cleanup
461
------------------------------------------------------------------------
462
r17567 | marek.horst | 2013-03-14 13:04:32 +0100 (Thu, 14 Mar 2013) | 1 line
463

  
464
dropping apache-lang dependancy, introducing simple byte[] concatenation method.
465
------------------------------------------------------------------------
466
r17211 | marek.horst | 2013-02-25 12:44:48 +0100 (Mon, 25 Feb 2013) | 1 line
467

  
468
adding bin and target dirs to svn:ignore
469
------------------------------------------------------------------------
470
r17172 | marek.horst | 2013-02-21 14:06:33 +0100 (Thu, 21 Feb 2013) | 1 line
471

  
472
fixing similarity collumn building process, skipping including relation type in qualifier
473
------------------------------------------------------------------------
474
r17169 | marek.horst | 2013-02-20 13:44:29 +0100 (Wed, 20 Feb 2013) | 1 line
475

  
476
aligning HBaseHelper.buildRowKey() implementation and usage in exporter data builder modules
477
------------------------------------------------------------------------
478
r17145 | marek.horst | 2013-02-19 16:24:56 +0100 (Tue, 19 Feb 2013) | 1 line
479

  
480
setting required timestamp in OAF entities and relations
481
------------------------------------------------------------------------
482
r17143 | marek.horst | 2013-02-19 15:53:05 +0100 (Tue, 19 Feb 2013) | 1 line
483

  
484
adding provenance related constants
485
------------------------------------------------------------------------
486
r17113 | marek.horst | 2013-02-18 18:35:45 +0100 (Mon, 18 Feb 2013) | 1 line
487

  
488
Funding related refactoring: renaming ProjectFunding to Project, adding id field. Renaming documentWithInferencedData#fundingId into projectId
489
------------------------------------------------------------------------
490
r17053 | mateusz.kobos | 2013-02-14 00:29:04 +0100 (Thu, 14 Feb 2013) | 1 line
491

  
492
Documentation update
493
------------------------------------------------------------------------
494
r17050 | mateusz.kobos | 2013-02-13 23:12:06 +0100 (Wed, 13 Feb 2013) | 1 line
495

  
496
Refactoring: moving some classes to the "icm-iis-common" project
497
------------------------------------------------------------------------
498
r17035 | marek.horst | 2013-02-13 12:21:46 +0100 (Wed, 13 Feb 2013) | 1 line
499

  
500
introducing icm-iis-common readme file containing brief module description
501
------------------------------------------------------------------------
502
r17023 | marek.horst | 2013-02-12 23:17:11 +0100 (Tue, 12 Feb 2013) | 1 line
503

  
504
setting svn:ignore in "icm-iis-common"
505
------------------------------------------------------------------------
506
r17022 | marek.horst | 2013-02-12 23:16:23 +0100 (Tue, 12 Feb 2013) | 1 line
507

  
508
Sharing empty "icm-iis-common"
509
------------------------------------------------------------------------
510
r17021 | marek.horst | 2013-02-12 23:15:58 +0100 (Tue, 12 Feb 2013) | 1 line
511

  
512
Share project "icm-iis-common" into "https://svn.driver.research-infrastructures.eu/driver/dnet11"
513
------------------------------------------------------------------------
0 514

  
modules/icm-iis-common/branches/IIS-CDH-5.3.0/src/main/java/eu/dnetlib/iis/common/model/extrainfo/citations/BlobCitationEntry.java
7 7
import java.util.regex.Pattern;
8 8

  
9 9
import com.thoughtworks.xstream.annotations.XStreamAlias;
10
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
10 11
import com.thoughtworks.xstream.annotations.XStreamImplicit;
11 12
import com.thoughtworks.xstream.annotations.XStreamOmitField;
12 13

  
......
19 20
public class BlobCitationEntry implements Comparable<BlobCitationEntry> {
20 21

  
21 22
	/**
23
	 * Citation position.
24
	 */
25
	@XStreamAsAttribute
26
	protected int position;
27
	
28
	/**
22 29
	 * Raw citation text.
23 30
	 */
24 31
	protected String rawText;
......
64 71
		int result = 1;
65 72
		result = prime * result
66 73
				+ ((identifiers == null) ? 0 : identifiers.hashCode());
74
		result = prime * result + position;
67 75
		result = prime * result + ((rawText == null) ? 0 : rawText.hashCode());
68 76
		return result;
69 77
	}
......
82 90
				return false;
83 91
		} else if (!identifiers.equals(other.identifiers))
84 92
			return false;
93
		if (position != other.position)
94
			return false;
85 95
		if (rawText == null) {
86 96
			if (other.rawText != null)
87 97
				return false;
......
93 103
	@Override
94 104
	public int compareTo(BlobCitationEntry c2) {
95 105
		if (c2!=null) {
96
		   if (this.getRawText()!=null) {
97
				if (c2.getRawText()!=null) {
98
					int textCompareResult = compareText(this.getRawText(), c2.getRawText());
99
					if (textCompareResult==0) {
100
						return compareIdentifiers(this.getIdentifiers(), c2.getIdentifiers());
106
			if (this.position>c2.position) {
107
				return 1;
108
			} else if (this.position<c2.position) {
109
				return -1;
110
			} else {
111
				   if (this.getRawText()!=null) {
112
						if (c2.getRawText()!=null) {
113
							int textCompareResult = compareText(this.getRawText(), c2.getRawText());
114
							if (textCompareResult==0) {
115
								return compareIdentifiers(this.getIdentifiers(), c2.getIdentifiers());
116
							} else {
117
								return textCompareResult;	
118
							}
119
						} else {
120
							return -1;
121
						}
101 122
					} else {
102
						return textCompareResult;	
103
					}
104
				} else {
105
					return -1;
106
				}
107
			} else {
108
				if (c2.getRawText()!=null) {
109
					return 1;
110
				} else {
111
					return compareIdentifiers(this.getIdentifiers(), c2.getIdentifiers());
112
				}
113
			}   
123
						if (c2.getRawText()!=null) {
124
							return 1;
125
						} else {
126
							return compareIdentifiers(this.getIdentifiers(), c2.getIdentifiers());
127
						}
128
					}   
129
				
130
			}
114 131
		} else {
115 132
			if (this.getRawText()!=null) {
116 133
				return -1;	
......
118 135
				if (this.getIdentifiers()!=null) {
119 136
					return -1;
120 137
				} else {
138
//					should we check position in any way?
121 139
					return 0;
122 140
				}
123 141
			}
......
175 193
	      }
176 194
	      return compareValue;
177 195
	   }
196

  
197
	/**
198
	 * @return the position
199
	 */
200
	public int getPosition() {
201
		return position;
202
	}
203

  
204
	/**
205
	 * @param position the position to set
206
	 */
207
	public void setPosition(int position) {
208
		this.position = position;
209
	}
178 210
}
modules/icm-iis-common/branches/IIS-CDH-5.3.0/src/main/java/eu/dnetlib/iis/common/WorkflowRuntimeParameters.java
8 8
	
9 9
	public static final String UNDEFINED_NONEMPTY_VALUE = "$UNDEFINED$";
10 10
	
11
	public static final String IMPORT_INFERENCE_PROVENANCE_BLACKLIST = "import.inference.provenance.blacklist";
12
	public static final String IMPORT_SKIP_DELETED_BY_INFERENCE = "import.skip.deleted.by.inference";
13
	public static final String IMPORT_TRUST_LEVEL_THRESHOLD = "import.trust.level.threshold";
14
	public static final String IMPORT_APPROVED_DATASOURCES_CSV = "import.approved.datasources.csv";
15
	public static final String IMPORT_MERGE_BODY_WITH_UPDATES = "import.merge.body.with.updates";
16
	public static final String IMPORT_CONTENT_APPROVED_OBJECSTORES_CSV = "import.content.approved.objectstores.csv";
17
	public static final String IMPORT_CONTENT_BLACKLISTED_OBJECSTORES_CSV = "import.content.blacklisted.objectstores.csv";
18
	public static final String IMPORT_CONTENT_ALLOW_DUPLICATES = "import.content.allow.duplicates";
19
	public static final String IMPORT_CONTENT_OBJECSTORE_PAGESIZE = "import.content.objectstore.resultset.pagesize";
20
	
21
	public static final String IMPORT_HBASE_TABLE_NAME = "import.hbase.table.name";
22
	public static final String IMPORT_HBASE_REMOTE_ZOOKEEPER_QUORUM = "import.hbase.remote.zookeeper.quorum";
23
	public static final String IMPORT_HBASE_REMOTE_ZOOKEEPER_CLIENTPORT = "import.hbase.remote.zookeeper.clientport";
24
	
25
	public static final String IMPORT_CONTENT_AVRO_LOCATION = "import.hdfs.urlcontent.avro.loc";
26
	public static final String IMPORT_CONTENT_INDEX_FILE_LOCATION = "import.hdfs.content.index.file.loc";
27
	
28
	public static final String IMPORT_CONTENT_CONNECTION_TIMEOUT = "import.content.connection.timeout";
29
	public static final String IMPORT_CONTENT_READ_TIMEOUT = "import.content.read.timeout";
30
	public static final String IMPORT_CONTENT_OBJECT_STORE_LOC = "import.content.object.store.location";
31
	public static final String IMPORT_CONTENT_LOOKUP_SERVICE_LOC = "import.content.lookup.service.location";
32
	public static final String IMPORT_CONTENT_OBJECT_STORE_IDS_CSV = "import.content.object.store.ids.csv";
33
	public static final String IMPORT_CONTENT_MAX_FILE_SIZE_MB = "import.content.max.file.size.mb";
34
	
35
	public static final String IMPORT_CONTENT_APPROVER_SIZELIMIT_MEGABYTES = "import.content.approver.sizelimit.megabytes";
36
	
37
	public static final String IMPORT_DATACITE_MDSTORE_SERVICE_LOCATION = "import.datacite.mdstore.service.location";
38
	public static final String IMPORT_DATACITE_MDSTORE_IDS_CSV = "import.datacite.mdstore.ids.csv";
39
	public static final String IMPORT_DATACITE_MDSTORE_PAGESIZE = "import.datacite.mdstore.resultset.pagesize";
40

  
41
	public static final String IMPORT_DOCUMENT_MDSTORE_SERVICE_LOCATION = "import.document.mdstore.service.location";
42
	public static final String IMPORT_DOCUMENT_MDSTORE_ID = "import.document.mdstore.id";
43
	
44
	public static final String IMPORT_DATABASE_SERVICE_LOCATION = "import.database.service.location";
45
	public static final String IMPORT_DATABASE_SERVICE_DBNAME = "import.database.service.dbname";
46
	
47
	public static final String IMPORT_ISLOOKUP_SERVICE_LOCATION = "import.islookup.service.location";
48
	public static final String IMPORT_VOCABULARY_CODE = "import.vocabulary.code";
49
	public static final String IMPORT_VOCABULARY_OUTPUT_FILENAME = "import.vocabulary.output.filename";
50
	
51
	
52
	public static final String IMPORT_RESULT_SET_CLIENT_READ_TIMEOUT = "import.resultset.client.read.timeout";
53
	
54
	public static final String EXPORT_TRUST_LEVEL = "export.trust.level";
55
	public static final String EXPORT_ACTION_SETID = "export.action.setid";
56
	public static final String EXPORT_ENTITY_ACTION_SETID = "export.entity.action.setid";
57
	public static final char EXPORT_ACTION_SET_PROPERTY_SEPARATOR = '.';	
58
	
59
	public static final String EXPORT_ACTION_BUILDER_FACTORY_CLASSNAME = "export.action.builder.factory.classname";
60
	public static final String EXPORT_ACTION_HBASE_TABLE_NAME = "export.action.hbase.table.name";
61
	public static final String EXPORT_ACTION_HBASE_TABLE_INITIALIZE = "export.action.hbase.table.initialize";
62
	public static final String EXPORT_ACTION_HBASE_REMOTE_ZOOKEEPER_QUORUM = "export.action.hbase.remote.zookeeper.quorum";
63
	public static final String EXPORT_ACTION_HBASE_REMOTE_ZOOKEEPER_CLIENTPORT = "export.action.hbase.remote.zookeeper.clientport";
64
	
65
	public static final String EXPORT_DOCUMENTSSIMILARITY_THRESHOLD = "export.documentssimilarity.threshold";
66
	
67
	public static final String EXPORT_HBASE_TABLE_NAME = "export.hbase.table.name";
68
	
69
	public static final String EXPORT_SKIP_ORIGINAL_METADATA = "export.skip.original.metadata";
70
	public static final String EXPORT_SKIP_AUTHORS = "export.skip.authors";
71
	
72
	public static final String HBASE_ENCODING = "hbase.table.encoding";
73
	
74 11
}

Also available in: Unified diff