Project

General

Profile

« Previous | Next » 

Revision 35403

Added by Marek Horst over 9 years ago

#1198 aligning IIS dependencies and java code to CDH5.3.0 cluster

View differences:

modules/icm-iis-export-actionmanager/branches/IIS-CDH-5.3.0/src/test/java/eu/dnetlib/iis/export/actionmanager/entity/dataset/DatasetExporterProcessManualTest.java
6 6

  
7 7
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
8 8

  
9
import org.apache.hadoop.hbase.KeyValue;
9
import org.apache.hadoop.hbase.Cell;
10
import org.apache.hadoop.hbase.CellUtil;
10 11
import org.apache.hadoop.hbase.client.Put;
11 12
import org.springframework.core.io.ClassPathResource;
12 13
import org.springframework.core.io.Resource;
......
64 65
		System.out.println("generated actions:");
65 66
		for (Put put : puts) {
66 67
			System.out.println(put.toJSON());
67
			List<KeyValue> results = put.get(
68
			List<Cell> results = put.get(
68 69
					ActionManagerConstants.TARGET_COLFAMILY, 
69 70
					ActionManagerConstants.TARGET_OAF_COL);
70 71
			if (results!=null) {
71
				for (KeyValue currentRes : results) {
72
				for (Cell currentRes : results) {
72 73
//					System.out.println("got content: " + new String(currentRes.getValue()));
73 74
					Oaf.Builder oafBuilder = Oaf.newBuilder();
74
					oafBuilder.mergeFrom(currentRes.getValue());
75
					oafBuilder.mergeFrom(CellUtil.cloneValue(currentRes));
75 76
					Oaf oaf = oafBuilder.build();
76 77
					System.out.println("got content: " + oaf.toString());
77 78
				}
modules/icm-iis-export-actionmanager/branches/IIS-CDH-5.3.0/pom.xml
3 3
	<parent>
4 4
    		<groupId>eu.dnetlib</groupId>
5 5
	        <artifactId>icm-iis-parent-container</artifactId>
6
            <version>1.0.0</version>
6
            <version>1.0.1-CDH-5.3.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<modelVersion>4.0.0</modelVersion>
9 9
	<artifactId>icm-iis-export-actionmanager</artifactId>
10 10
	<packaging>jar</packaging>
11
	<version>1.0.1-SNAPSHOT</version>
11
	<version>1.0.1-CDH-5.3.0-SNAPSHOT</version>
12 12

  
13 13
	<scm>
14 14
	  <developerConnection>
......
75 75
		</dependency>
76 76
		<dependency>
77 77
			<groupId>org.apache.hbase</groupId>
78
			<artifactId>hbase</artifactId>
78
			<artifactId>${iis.hbase.artifactid}</artifactId>
79 79
			<version>${iis.hbase.version}</version>
80
			<!-- hbase-client does not seem to be provided on CDH5 cluster
80 81
			<scope>provided</scope>
82
			-->
81 83
		</dependency>
82 84
		<dependency>
83 85
			<groupId>eu.dnetlib</groupId>

Also available in: Unified diff