Update spatial SDK to v2.0 (#69)

- also Geometry v2, Hadoop v2, Jackson v2
Esri · Jan 9, 2018 · bc850f7 · bc850f7
1 parent cd440cf
commit bc850f7
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 24 deletions.
diff --git a/samples/json-mr/README.md b/samples/json-mr/README.md
@@ -11,8 +11,8 @@ in Enclosed or Unenclosed form - examples follow:
 ```
 ant  # may need to adjust Hadoop version in build.xml
 hadoop fs -put data/*.json data/
-export HADOOP_CLASSPATH=../lib/esri-geometry-api.jar:../lib/spatial-sdk-json-1.2.0.jar
-libjars="-libjars ../lib/esri-geometry-api.jar,../lib/spatial-sdk-json-1.2.0.jar"
+export HADOOP_CLASSPATH=../lib/esri-geometry-api-2.0.0.jar:../lib/spatial-sdk-json-2.0.0.jar
+libjars="-libjars ../lib/esri-geometry-api-2.0.0.jar,../lib/spatial-sdk-json-2.0.0.jar"
 
 # hdfs dfs -rmdir eejs-out >/dev/null 2>&1 || /bin/true
 hadoop jar json-mr-sample.jar com.esri.hadoop.examples.json.JsonInputSample ${libjars} enc esri data/test15eej.json eejs-out

diff --git a/samples/lib/esri-geometry-api-2.0.0.jar b/samples/lib/esri-geometry-api-2.0.0.jar
diff --git a/samples/lib/esri-geometry-api.jar b/samples/lib/esri-geometry-api.jar
diff --git a/samples/lib/spatial-sdk-hive-1.2.0.jar → samples/lib/spatial-sdk-hive-2.0.0.jar b/samples/lib/spatial-sdk-hive-1.2.0.jar → samples/lib/spatial-sdk-hive-2.0.0.jar
diff --git a/samples/lib/spatial-sdk-json-1.2.0.jar b/samples/lib/spatial-sdk-json-1.2.0.jar
diff --git a/samples/lib/spatial-sdk-json-2.0.0.jar b/samples/lib/spatial-sdk-json-2.0.0.jar
diff --git a/samples/point-in-polygon-aggregation-hive/README.md b/samples/point-in-polygon-aggregation-hive/README.md
@@ -30,9 +30,9 @@ hive
 Add the required external libraries and create temporary functions for the geometry api calls.
 ```bash
 add jar
-  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/esri-geometry-api.jar
-  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/spatial-sdk-hive-1.2.0.jar
-  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/spatial-sdk-json-1.2.0.jar;
+  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/esri-geometry-api-2.0.0.jar
+  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/spatial-sdk-hive-2.0.0.jar
+  ${env:HOME}/esri-git/gis-tools-for-hadoop/samples/lib/spatial-sdk-json-2.0.0.jar;
 
 create temporary function ST_Point as 'com.esri.hadoop.hive.ST_Point';
 create temporary function ST_Contains as 'com.esri.hadoop.hive.ST_Contains';

diff --git a/samples/point-in-polygon-aggregation-hive/run-sample.sql b/samples/point-in-polygon-aggregation-hive/run-sample.sql
@@ -1,7 +1,7 @@
 add jar
-  ../lib/esri-geometry-api.jar
-  ../lib/spatial-sdk-hive-1.2.0.jar
-  ../lib/spatial-sdk-json-1.2.0.jar;
+  ../lib/esri-geometry-api-2.0.0.jar
+  ../lib/spatial-sdk-hive-2.0.0.jar
+  ../lib/spatial-sdk-json-2.0.0.jar;
 
 create temporary function ST_Point as 'com.esri.hadoop.hive.ST_Point';
 create temporary function ST_Contains as 'com.esri.hadoop.hive.ST_Contains';

diff --git a/samples/point-in-polygon-aggregation-mr/build.xml b/samples/point-in-polygon-aggregation-mr/build.xml
@@ -3,8 +3,8 @@
 	<property name="dir.build" value="build" />
 
 	<artifact:dependencies pathId="dependencies.class.path">
-		<dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="0.20.2"/>
-		<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.12"/>
+		<dependency groupId="org.apache.hadoop" artifactId="hadoop-client" version="2.7.5"/>
+		<dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.6.5"/>
 	</artifact:dependencies>
 
 	<path id="local.class.path">

diff --git a/samples/point-in-polygon-aggregation-mr/cmd/run-sample.sh b/samples/point-in-polygon-aggregation-mr/cmd/run-sample.sh
@@ -21,7 +21,7 @@ hadoop fs -put ../../data/earthquake-data/* $DATA_DIR/earthquake-data
 echo "* executing MapReduce job"
 hadoop jar ../aggregation-sample.jar \
            com.esri.hadoop.examples.AggregationSampleDriver \
-           -libjars ../../lib/esri-geometry-api.jar,../../lib/spatial-sdk-json-1.2.0.jar \
+           -libjars ../../lib/esri-geometry-api-2.0.0.jar,../../lib/spatial-sdk-json-2.0.0.jar \
            hdfs://$DATA_DIR/counties-data/california-counties.json \
            hdfs://$DATA_DIR/earthquake-data/earthquakes.csv \
            hdfs://$OUTPUT_DIR

diff --git a/samples/point-in-polygon-aggregation-mr/gp/README.md b/samples/point-in-polygon-aggregation-mr/gp/README.md
@@ -27,12 +27,12 @@ Your directory structure in HDFS should look something like this:
         earthquakes.csv
       job/
         aggregation-sample.jar
-        esri-geometry-api.jar
-        spatial-sdk-json-1.2.0.jar
+        esri-geometry-api-2.0.0.jar
+        spatial-sdk-json-2.0.0.jar
         workflow.xml
 ```
 
-* `esri-geometry-api.jar` and `spatial-sdk-json-1.2.0.jar` can be found in `samples/lib`.  
+* `esri-geometry-api-2.0.0.jar` and `spatial-sdk-json-2.0.0.jar` can be found in `samples/lib`.  
 * `aggregation-sample.jar` is in the root directory of this sample
 * `workflow.xml` is in this directory
 

diff --git a/samples/trip-discovery/README.md b/samples/trip-discovery/README.md
@@ -46,9 +46,9 @@ Make sure `hadoop` is in the path set in your environment.
 Then please adapt the following recipes to your data.
 
 ```bash
-env HADOOP_CLASSPATH=../lib/esri-geometry-api.jar:../lib/spatial-sdk-json-1.2.0.jar  hadoop jar trip-discovery.jar com.esri.hadoop.examples.trip.TripCellDriver  -libjars ../lib/esri-geometry-api.jar,../lib/spatial-sdk-json-1.2.0.jar 15 500 sample-study-area.json sample-vehicle-positions.csv out-trip-1
+env HADOOP_CLASSPATH=../lib/esri-geometry-api-2.0.0.jar:../lib/spatial-sdk-json-2.0.0.jar  hadoop jar trip-discovery.jar com.esri.hadoop.examples.trip.TripCellDriver  -libjars ../lib/esri-geometry-api-2.0.0.jar,../lib/spatial-sdk-json-2.0.0.jar 15 500 sample-study-area.json sample-vehicle-positions.csv out-trip-1
 
-env HADOOP_CLASSPATH=../lib/esri-geometry-api.jar  hadoop jar trip-discovery.jar com.esri.hadoop.examples.trip.TripInCommonDriver -libjars ../lib/esri-geometry-api.jar 2 'out-trip-1/part-r-*' out-trip-2
+env HADOOP_CLASSPATH=../lib/esri-geometry-api-2.0.0.jar  hadoop jar trip-discovery.jar com.esri.hadoop.examples.trip.TripInCommonDriver -libjars ../lib/esri-geometry-api-2.0.0.jar 2 'out-trip-1/part-r-*' out-trip-2
 ```
 
 ### Geoprocessing tools ###

diff --git a/samples/trip-discovery/build.xml b/samples/trip-discovery/build.xml
@@ -3,8 +3,8 @@
 	<property name="dir.build" value="build" />
 
 	<artifact:dependencies pathId="dependencies.class.path">
-		<dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="0.20.2"/>
-		<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.12"/>
+		<dependency groupId="org.apache.hadoop" artifactId="hadoop-client" version="2.7.5"/>
+		<dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.6.5"/>
 	</artifact:dependencies>
 
 	<path id="local.class.path">
@@ -18,7 +18,7 @@
 	</target>
 
 	<target name="compile" depends="init">
-		<javac srcdir="src" destdir="${dir.build}">
+		<javac target="1.6" srcdir="src" destdir="${dir.build}">
 			<classpath refid="dependencies.class.path"/>	
 			<classpath refid="local.class.path"/>	
 		</javac>

diff --git a/samples/trip-discovery/cmd/run-it.sh b/samples/trip-discovery/cmd/run-it.sh
@@ -18,8 +18,8 @@ LIB_DIR=../../lib
 DATA_DIR=$SAMPLE_DIR/data
 INTER_DIR=$SAMPLE_DIR/inter
 OUTPUT_DIR=$SAMPLE_DIR/output
-GEOM_LIB=esri-geometry-api.jar
-SPATIAL_SDK=spatial-sdk-json-1.2.0.jar
+GEOM_LIB=esri-geometry-api-2.0.0.jar
+SPATIAL_SDK=spatial-sdk-json-2.0.0.jar
 TRIP_LIB=trip-discovery.jar
 RESULTS=results.txt
 

diff --git a/samples/trip-discovery/gp/README.md b/samples/trip-discovery/gp/README.md
@@ -25,13 +25,13 @@ Your directory structure in HDFS should look something like this:
       data/
         sample-vehicle-positions.csv
       job/
-        esri-geometry-api.jar
-        spatial-sdk-json-1.2.0.jar
+        esri-geometry-api-2.0.0.jar
+        spatial-sdk-json-2.0.0.jar
         trip-discovery.jar
         workflow.xml
 ```
 
-* `esri-geometry-api.jar` and `spatial-sdk-json-1.2.0.jar` can be found in `samples/lib`.  
+* `esri-geometry-api-2.0.0.jar` and `spatial-sdk-json-2.0.0.jar` can be found in `samples/lib`.  
 * `trip-discovery.jar` is in the root directory of this sample
 * `workflow.xml` is in this directory (i.e. this `gp` subdirectory)