Skip to content

Commit fc9df6c

Browse files
rfecherrfecher
committed
Merge pull request #360 from ngageoint/GEOWAVE-320-final
Refactor project to separate core from extensions (#320)
2 parents 845ac4b + 37a0757 commit fc9df6c

File tree

921 files changed

+12203
-14986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

921 files changed

+12203
-14986
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ before_install:
2525
- chmod +x .utility/maven-coveralls-hack.sh
2626
- chmod +x .utility/changelog-generator.sh
2727
- .utility/maven-coveralls-hack.sh
28+
- cd dev-resources;mvn clean install;cd ..
2829
after_success:
2930
- .utility/changelog-generator.sh
3031
- .utility/push-javadoc-to-gh-pages.sh
31-
- cd geowave-test; mvn coveralls:report -Daccumulo.version=${ACCUMULO_VERSION} ${ACCUMULO_LEGACY} -Dhadoop.version=${HADOOP_VERSION} -Dgeotools.version=${GEOTOOLS_VERSION} -Dgeoserver.version=${GEOSERVER_VERSION} -P ${PLATFORM_VERSION}
32+
- cd test; mvn coveralls:report -Daccumulo.version=${ACCUMULO_VERSION} ${ACCUMULO_LEGACY} -Dhadoop.version=${HADOOP_VERSION} -Dgeotools.version=${GEOTOOLS_VERSION} -Dgeoserver.version=${GEOSERVER_VERSION} -P ${PLATFORM_VERSION}
3233

3334
addons:
3435
apt_packages:

geowave-utils/pom.xml renamed to analytics/api/pom.xml

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,84 +2,85 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>geowave-parent</artifactId>
5+
<artifactId>geowave-analytic-parent</artifactId>
66
<groupId>mil.nga.giat</groupId>
77
<relativePath>../</relativePath>
88
<version>0.8.7-SNAPSHOT</version>
99
</parent>
10-
<artifactId>geowave-utils</artifactId>
11-
<name>geowave-utils</name>
10+
<artifactId>geowave-analytic-api</artifactId>
11+
<name>GeoWave Analytics API</name>
1212
<dependencies>
1313
<dependency>
1414
<groupId>mil.nga.giat</groupId>
15-
<artifactId>geowave-accumulo</artifactId>
15+
<artifactId>geowave-datastore-accumulo</artifactId>
1616
<version>${project.version}</version>
17-
<exclusions>
18-
<exclusion>
19-
<artifactId>jersey-core</artifactId>
20-
<groupId>com.sun.jersey</groupId>
21-
</exclusion>
22-
</exclusions>
2317
</dependency>
2418
<dependency>
2519
<groupId>mil.nga.giat</groupId>
26-
<artifactId>geowave-index</artifactId>
20+
<artifactId>geowave-adapter-vector</artifactId>
2721
<version>${project.version}</version>
22+
<exclusions>
23+
<exclusion>
24+
<artifactId>jdk.tools</artifactId>
25+
<groupId>jdk.tools</groupId>
26+
</exclusion>
27+
<exclusion>
28+
<artifactId>mockito-all</artifactId>
29+
<groupId>org.mockito</groupId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>javax.servlet</groupId>
33+
<artifactId>*</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>org.geoserver</groupId>
37+
<artifactId>gs-wms</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>org.geoserver</groupId>
41+
<artifactId>gs-main</artifactId>
42+
</exclusion>
43+
</exclusions>
2844
</dependency>
2945
<dependency>
3046
<groupId>mil.nga.giat</groupId>
31-
<artifactId>geowave-vector</artifactId>
47+
<artifactId>geowave-adapter-raster</artifactId>
3248
<version>${project.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.apache.accumulo</groupId>
36-
<artifactId>accumulo-minicluster</artifactId>
3749
<exclusions>
3850
<exclusion>
39-
<groupId>org.apache.accumulo</groupId>
40-
<artifactId>accumulo-monitor</artifactId>
51+
<artifactId>jdk.tools</artifactId>
52+
<groupId>jdk.tools</groupId>
53+
</exclusion>
54+
<exclusion>
55+
<artifactId>mockito-all</artifactId>
56+
<groupId>org.mockito</groupId>
4157
</exclusion>
4258
<exclusion>
43-
<groupId>org.slf4j</groupId>
59+
<groupId>javax.servlet</groupId>
4460
<artifactId>*</artifactId>
4561
</exclusion>
4662
<exclusion>
47-
<artifactId>jersey-core</artifactId>
48-
<groupId>com.sun.jersey</groupId>
63+
<groupId>org.geoserver</groupId>
64+
<artifactId>gs-wms</artifactId>
65+
</exclusion>
66+
<exclusion>
67+
<groupId>org.geoserver</groupId>
68+
<artifactId>gs-main</artifactId>
4969
</exclusion>
5070
</exclusions>
5171
</dependency>
72+
<dependency>
73+
<groupId>junit</groupId>
74+
<artifactId>junit</artifactId>
75+
<version>4.11</version>
76+
<scope>test</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>com.esotericsoftware.kryo</groupId>
80+
<artifactId>kryo</artifactId>
81+
<version>2.21</version>
82+
</dependency>
5283
</dependencies>
53-
<profiles>
54-
<profile>
55-
<id>accumulo-server</id>
56-
<activation>
57-
<property>
58-
<name>accumulo.legacy</name>
59-
</property>
60-
</activation>
61-
<dependencies>
62-
<dependency>
63-
<groupId>org.apache.accumulo</groupId>
64-
<artifactId>accumulo-server</artifactId>
65-
</dependency>
66-
</dependencies>
67-
</profile>
68-
<profile>
69-
<id>accumulo-monitor</id>
70-
<activation>
71-
<property>
72-
<name>!accumulo.legacy</name>
73-
</property>
74-
</activation>
75-
<dependencies>
76-
<dependency>
77-
<groupId>org.apache.accumulo</groupId>
78-
<artifactId>accumulo-monitor</artifactId>
79-
</dependency>
80-
</dependencies>
81-
</profile>
82-
</profiles>
8384
<build>
8485
<plugins>
8586
<plugin>

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/AdapterWithObjectWritable.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AdapterWithObjectWritable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
import java.io.DataInput;
44
import java.io.DataOutput;
55
import java.io.IOException;
66

7-
import mil.nga.giat.geowave.accumulo.mapreduce.HadoopWritableSerializationTool;
8-
import mil.nga.giat.geowave.index.ByteArrayId;
7+
import mil.nga.giat.geowave.core.index.ByteArrayId;
8+
import mil.nga.giat.geowave.datastore.accumulo.mapreduce.HadoopWritableSerializationTool;
99

1010
import org.apache.hadoop.io.ObjectWritable;
1111
import org.apache.hadoop.io.Writable;

‎analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AnalyticCLIOperationDriver.java‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package mil.nga.giat.geowave.analytic;
2+
3+
import java.util.HashSet;
4+
import java.util.Set;
5+
6+
import mil.nga.giat.geowave.core.cli.CLIOperationDriver;
7+
8+
import org.apache.commons.cli.BasicParser;
9+
import org.apache.commons.cli.CommandLine;
10+
import org.apache.commons.cli.HelpFormatter;
11+
import org.apache.commons.cli.Option;
12+
import org.apache.commons.cli.OptionGroup;
13+
import org.apache.commons.cli.Options;
14+
import org.apache.commons.cli.ParseException;
15+
import org.slf4j.Logger;
16+
import org.slf4j.LoggerFactory;
17+
18+
public class AnalyticCLIOperationDriver implements
19+
CLIOperationDriver
20+
{
21+
private static final Logger LOGGER = LoggerFactory.getLogger(AnalyticCLIOperationDriver.class);
22+
private final IndependentJobRunner jobRunner;
23+
24+
public AnalyticCLIOperationDriver(
25+
final IndependentJobRunner jobRunner ) {
26+
super();
27+
this.jobRunner = jobRunner;
28+
}
29+
30+
@Override
31+
public void run(
32+
final String[] args )
33+
throws ParseException {
34+
final Options options = new Options();
35+
final OptionGroup baseOptionGroup = new OptionGroup();
36+
baseOptionGroup.setRequired(false);
37+
baseOptionGroup.addOption(new Option(
38+
"h",
39+
"help",
40+
false,
41+
"Display help"));
42+
options.addOptionGroup(baseOptionGroup);
43+
44+
final Set<Option> optionSet = new HashSet<Option>();
45+
jobRunner.fillOptions(optionSet);
46+
for (final Option option : optionSet) {
47+
options.addOption(option);
48+
}
49+
50+
final BasicParser parser = new BasicParser();
51+
final CommandLine commandLine = parser.parse(
52+
options,
53+
args);
54+
if (commandLine.hasOption("h")) {
55+
printHelp(options);
56+
return;
57+
}
58+
else {
59+
final PropertyManagement pm = new PropertyManagement();
60+
pm.buildFromOptions(commandLine);
61+
try {
62+
jobRunner.run(pm);
63+
}
64+
catch (final Exception e) {
65+
LOGGER.error(
66+
"Unable to run analytic job",
67+
e);
68+
return;
69+
}
70+
}
71+
}
72+
73+
private static void printHelp(
74+
final Options options ) {
75+
final HelpFormatter formatter = new HelpFormatter();
76+
formatter.printHelp(
77+
"Analytics",
78+
"\nOptions:",
79+
options,
80+
"");
81+
}
82+
}

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/AnalyticFeature.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AnalyticFeature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
import java.util.List;
44

5-
import mil.nga.giat.geowave.vector.adapter.FeatureDataAdapter;
5+
import mil.nga.giat.geowave.adapter.vector.FeatureDataAdapter;
66

77
import org.geotools.feature.simple.SimpleFeatureBuilder;
88
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/AnalyticItemWrapper.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AnalyticItemWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
import com.vividsolutions.jts.geom.Geometry;
44

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/AnalyticItemWrapperFactory.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AnalyticItemWrapperFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
import java.io.IOException;
44

‎analytics/api/src/main/java/mil/nga/giat/geowave/analytic/AnalyticOperationCategory.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package mil.nga.giat.geowave.analytic;
2+
3+
import mil.nga.giat.geowave.core.cli.CustomOperationCategory;
4+
5+
public class AnalyticOperationCategory extends
6+
CustomOperationCategory
7+
{
8+
9+
public AnalyticOperationCategory() {
10+
super(
11+
"anayltic",
12+
"Analytics",
13+
"Operations to perform analysis on GeoWave data");
14+
}
15+
16+
}

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/ConfigurationWrapper.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/ConfigurationWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
public interface ConfigurationWrapper
44
{

geowave-analytics/src/main/java/mil/nga/giat/geowave/analytics/tools/GeoObjectDimensionValues.java renamed to analytics/api/src/main/java/mil/nga/giat/geowave/analytic/GeoObjectDimensionValues.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package mil.nga.giat.geowave.analytics.tools;
1+
package mil.nga.giat.geowave.analytic;
22

33
import java.nio.ByteBuffer;
44

5-
import mil.nga.giat.geowave.index.Persistable;
5+
import mil.nga.giat.geowave.core.index.Persistable;
66

77
/**
88
*

0 commit comments

Comments
 (0)