Skip to content

Commit 196c716

Browse files
rfecherrfecher
authored
removed existing references to javaspark (#1259)
1 parent f1f1517 commit 196c716

7 files changed

Lines changed: 77 additions & 78 deletions

File tree

‎analytics/spark/src/main/resources/META-INF/services/mil.nga.giat.geowave.core.cli.spi.CLIOperationProviderSpi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mil.nga.giat.geowave.analytic.javaspark.AnalyticOperationCLIProvider
1+
mil.nga.giat.geowave.analytic.spark.AnalyticOperationCLIProvider

‎examples/data/notebooks/jupyter/geowave-gdelt.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8533,10 +8533,10 @@
85338533
"source": [
85348534
"#grab classes from jvm\n",
85358535
"hbase_options_class = sc._jvm.mil.nga.giat.geowave.datastore.hbase.operations.config.HBaseRequiredOptions\n",
8536-
"kmeans_runner_class = sc._jvm.mil.nga.giat.geowave.analytic.javaspark.kmeans.KMeansRunner\n",
8536+
"kmeans_runner_class = sc._jvm.mil.nga.giat.geowave.analytic.spark.kmeans.KMeansRunner\n",
85378537
"query_options_class = sc._jvm.mil.nga.giat.geowave.core.store.query.QueryOptions\n",
8538-
"geowave_rdd_class = sc._jvm.mil.nga.giat.geowave.analytic.javaspark.GeoWaveRDD\n",
8539-
"sf_df_class = sc._jvm.mil.nga.giat.geowave.analytic.javaspark.sparksql.SimpleFeatureDataFrame\n",
8538+
"geowave_rdd_class = sc._jvm.mil.nga.giat.geowave.analytic.spark.GeoWaveRDD\n",
8539+
"sf_df_class = sc._jvm.mil.nga.giat.geowave.analytic.spark.sparksql.SimpleFeatureDataFrame\n",
85408540
"byte_array_class = sc._jvm.mil.nga.giat.geowave.core.index.ByteArrayId"
85418541
]
85428542
},

‎examples/data/notebooks/jupyter/geowave-gpx.ipynb‎

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

‎examples/data/notebooks/zeppelin/GDELT-Quick-Start.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎examples/data/notebooks/zeppelin/GeoWave-GPX-Demo.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎services/rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</dependency>
117117
<dependency>
118118
<groupId>mil.nga.giat</groupId>
119-
<artifactId>geowave-analytic-javaspark</artifactId>
119+
<artifactId>geowave-analytic-spark</artifactId>
120120
<version>${project.version}</version>
121121
</dependency>
122122
<dependency>

‎test/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,7 @@
309309
<sourceDirectory>../extensions/formats/gdelt/src/main/java</sourceDirectory>
310310
<sourceDirectory>../analytics/api/target/munged/main</sourceDirectory>
311311
<sourceDirectory>../analytics/mapreduce/target/munged/main</sourceDirectory>
312-
<sourceDirectory>../analytics/spark/src/main/scala</sourceDirectory>
313-
<sourceDirectory>../analytics/javaspark/src/main/java</sourceDirectory>
312+
<sourceDirectory>../analytics/spark/src/main/java</sourceDirectory>
314313
<sourceDirectory>../services/rest/src/main/java</sourceDirectory>
315314
<sourceDirectory>../deploy/src/main/java</sourceDirectory>
316315
<sourceDirectory>../examples/java-api/src/main/java</sourceDirectory>

0 commit comments

Comments
 (0)