Skip to content

Commit 03b3e70

Browse files
rfecherrfecher
committed
moved test server commands from examples to projects
1 parent b8685f2 commit 03b3e70

15 files changed

Lines changed: 56 additions & 91 deletions

File tree

‎examples/pom.xml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,6 @@
3232
<artifactId>geowave-adapter-raster</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
35-
<dependency>
36-
<groupId>com.github.sakserv</groupId>
37-
<artifactId>hadoop-mini-clusters-hbase</artifactId>
38-
<version>0.1.3</version>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>hsqldb</groupId>
42-
<artifactId>hsqldb</artifactId>
43-
</exclusion>
44-
<exclusion>
45-
<groupId>org.apache.hadoop</groupId>
46-
<artifactId>hadoop-core</artifactId>
47-
</exclusion>
48-
</exclusions>
49-
</dependency>
50-
<dependency>
51-
<groupId>com.github.sakserv</groupId>
52-
<artifactId>hadoop-mini-clusters-zookeeper</artifactId>
53-
<version>0.1.3</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>com.github.sakserv</groupId>
57-
<artifactId>property-parser</artifactId>
58-
<version>0.0.3</version>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>org.slf4j</groupId>
62-
<artifactId>*</artifactId>
63-
</exclusion>
64-
</exclusions>
65-
</dependency>
6635
<dependency>
6736
<groupId>com.google.code.findbugs</groupId>
6837
<artifactId>annotations</artifactId>

‎examples/src/main/java/mil/nga/giat/geowave/example/cli/ExampleOperationProvider.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎examples/src/main/java/mil/nga/giat/geowave/example/cli/ExampleSection.java‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/src/main/java/mil/nga/giat/geowave/examples/accumulo/app/GeoWaveDemoApp.java renamed to extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/app/AccumuloMiniCluster.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package mil.nga.giat.geowave.datastore.accumulo.app;
2+
13
/*******************************************************************************
24
* Copyright (c) 2013-2017 Contributors to the Eclipse Foundation
35
*
@@ -8,8 +10,6 @@
810
* Version 2.0 which accompanies this distribution and is available at
911
* http://www.apache.org/licenses/LICENSE-2.0.txt
1012
******************************************************************************/
11-
package mil.nga.giat.geowave.examples.accumulo.app;
12-
1313
import java.io.File;
1414
import java.util.concurrent.TimeUnit;
1515

@@ -26,9 +26,9 @@
2626

2727
import mil.nga.giat.geowave.datastore.accumulo.minicluster.MiniAccumuloClusterFactory;
2828

29-
public class GeoWaveDemoApp
29+
public class AccumuloMiniCluster
3030
{
31-
private static final Logger LOGGER = LoggerFactory.getLogger(GeoWaveDemoApp.class);
31+
private static final Logger LOGGER = LoggerFactory.getLogger(AccumuloMiniCluster.class);
3232
protected static final String HADOOP_WINDOWS_UTIL = "winutils.exe";
3333

3434
protected static boolean isYarn() {
@@ -64,7 +64,7 @@ public static void main(
6464

6565
final MiniAccumuloClusterImpl accumulo = MiniAccumuloClusterFactory.newAccumuloCluster(
6666
miniAccumuloConfig,
67-
GeoWaveDemoApp.class);
67+
AccumuloMiniCluster.class);
6868
accumulo.start();
6969

7070
accumulo.exec(Monitor.class);
@@ -106,4 +106,4 @@ public void run() {
106106
}
107107
}
108108
}
109-
}
109+
}

extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/app/GeoWaveDemoAppShell.java renamed to extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/app/AccumuloMiniClusterShell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import mil.nga.giat.geowave.core.cli.operations.config.security.utils.SecurityUtils;
3030

31-
public class GeoWaveDemoAppShell
31+
public class AccumuloMiniClusterShell
3232
{
3333

3434
public static void main(

extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/operations/AccumuloSplitsOperationCLIProvider.java renamed to extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/operations/AccumuloOperationProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Copyright (c) 2013-2017 Contributors to the Eclipse Foundation
3-
*
3+
*
44
* See the NOTICE file distributed with this work for additional
55
* information regarding copyright ownership.
66
* All rights reserved. This program and the accompanying materials
@@ -12,11 +12,12 @@
1212

1313
import mil.nga.giat.geowave.core.cli.spi.CLIOperationProviderSpi;
1414

15-
public class AccumuloSplitsOperationCLIProvider implements
15+
public class AccumuloOperationProvider implements
1616
CLIOperationProviderSpi
1717
{
1818
private static final Class<?>[] OPERATIONS = new Class<?>[] {
1919
AccumuloSection.class,
20+
AccumuloRunServerCommand.class,
2021
PreSplitPartitionIdCommand.class,
2122
SplitEqualIntervalCommand.class,
2223
SplitNumRecordsCommand.class,

examples/src/main/java/mil/nga/giat/geowave/example/cli/ExampleAccumuloServerCommand.java renamed to extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/operations/AccumuloRunServerCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mil.nga.giat.geowave.example.cli;
1+
package mil.nga.giat.geowave.datastore.accumulo.operations;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -9,15 +9,15 @@
99
import mil.nga.giat.geowave.core.cli.api.Command;
1010
import mil.nga.giat.geowave.core.cli.api.DefaultOperation;
1111
import mil.nga.giat.geowave.core.cli.api.OperationParams;
12-
import mil.nga.giat.geowave.examples.accumulo.app.GeoWaveDemoApp;
12+
import mil.nga.giat.geowave.datastore.accumulo.app.AccumuloMiniCluster;
1313

14-
@GeowaveOperation(name = "accumulo-server", parentOperation = ExampleSection.class)
14+
@GeowaveOperation(name = "runserver", parentOperation = AccumuloSection.class)
1515
@Parameters(commandDescription = "Runs a standalone mini Accumulo server for test and debug with GeoWave")
16-
public class ExampleAccumuloServerCommand extends
16+
public class AccumuloRunServerCommand extends
1717
DefaultOperation implements
1818
Command
1919
{
20-
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleHBaseServerCommand.class);
20+
private static final Logger LOGGER = LoggerFactory.getLogger(AccumuloRunServerCommand.class);
2121

2222
/**
2323
* Prep the driver & run the operation.
@@ -26,7 +26,7 @@ public class ExampleAccumuloServerCommand extends
2626
public void execute(
2727
final OperationParams params ) {
2828
try {
29-
GeoWaveDemoApp.main(new String[] {});
29+
AccumuloMiniCluster.main(new String[] {});
3030
}
3131
catch (final Exception e) {
3232
LOGGER.error(

‎extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/operations/AccumuloSection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Copyright (c) 2013-2017 Contributors to the Eclipse Foundation
3-
*
3+
*
44
* See the NOTICE file distributed with this work for additional
55
* information regarding copyright ownership.
66
* All rights reserved. This program and the accompanying materials
@@ -17,7 +17,7 @@
1717
import mil.nga.giat.geowave.core.cli.operations.GeowaveTopLevelSection;
1818

1919
@GeowaveOperation(name = "accumulo", parentOperation = GeowaveTopLevelSection.class)
20-
@Parameters(commandDescription = "Utility operations to set accumulo splits")
20+
@Parameters(commandDescription = "Utility operations to set accumulo splits and run a test server")
2121
public class AccumuloSection extends
2222
DefaultOperation
2323
{

‎extensions/datastores/accumulo/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.datastore.accumulo.operations.AccumuloSplitsOperationCLIProvider
1+
mil.nga.giat.geowave.datastore.accumulo.operations.AccumuloOperationProvider

0 commit comments

Comments
 (0)