Skip to content

Commit 633803a

Browse files
author
Ahmed Kamel
committed
Merge branch 'master' into ahmed_ci_dev
2 parents 87e3d48 + a42263d commit 633803a

File tree

21 files changed

+433
-289
lines changed

21 files changed

+433
-289
lines changed

‎docs/content/integrate-geoserver/145-hw-quickstart-guide-geoserver.adoc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ SandBox
1313
[source, bash]
1414
----
1515
geowave config geoserver sandbox.hortonworks.com:8993
16-
export HADOOP_HOME="/usr/hdp/2.6.0.3-8/hadoop/"
17-
service geowave restart
1816
----
1917

2018
EMR
2119

2220
[source, bash]
2321
----
2422
geowave config geoserver "$HOSTNAME:8000"
25-
service geowave restart
2623
----
2724

2825
Please allow 1-2 minutes for the GeoServer to restart before attempting to complete Add Layers and Styles.

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/ConfigGeoServerCommand.java‎

Lines changed: 28 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static mil.nga.giat.geowave.cli.geoserver.constants.GeoServerConstants.GEOSERVER_USER;
1717
import static mil.nga.giat.geowave.cli.geoserver.constants.GeoServerConstants.GEOSERVER_WORKSPACE;
1818

19-
import java.io.File;
2019
import java.lang.reflect.Field;
2120
import java.util.ArrayList;
2221
import java.util.List;
@@ -45,7 +44,7 @@
4544
@GeowaveOperation(name = "geoserver", parentOperation = ConfigSection.class)
4645
@Parameters(commandDescription = "Create a local configuration for GeoServer")
4746
public class ConfigGeoServerCommand extends
48-
GeoServerCommand<Void>
47+
ServiceEnabledCommand<String>
4948
{
5049
@Parameter(names = {
5150
"-u",
@@ -110,48 +109,8 @@ else if (passwordSpecified && !usernameSpecified) {
110109
public void execute(
111110
final OperationParams params )
112111
throws Exception {
113-
114-
if (parameters.size() != 1) {
115-
throw new ParameterException(
116-
"Requires argument: <GeoServer URL>");
117-
}
118-
url = parameters.get(0);
119-
final Properties existingProps = getGeoWaveConfigProperties(params);
120-
121-
// all switches are optional
122-
if (url != null) {
123-
existingProps.setProperty(
124-
GEOSERVER_URL,
125-
url);
126-
}
127-
128-
if (getName() != null) {
129-
existingProps.setProperty(
130-
GEOSERVER_USER,
131-
getName());
132-
}
133-
134-
if (getPass() != null) {
135-
existingProps.setProperty(
136-
GEOSERVER_PASS,
137-
getPass());
138-
}
139-
140-
if (getWorkspace() != null) {
141-
existingProps.setProperty(
142-
GEOSERVER_WORKSPACE,
143-
getWorkspace());
144-
}
145-
146-
// save properties from ssl configurations
147-
sslConfigOptions.saveProperties(existingProps);
148-
149-
// Write properties file
150-
ConfigOptions.writeProperties(
151-
getGeoWaveConfigFile(params),
152-
existingProps,
153-
this.getClass(),
154-
GEOSERVER_NAMESPACE_PREFIX);
112+
JCommander.getConsole().println(
113+
computeResults(params));
155114
}
156115

157116
public String getName() {
@@ -258,14 +217,16 @@ public String usage() {
258217
}
259218

260219
@Override
261-
public Void computeResults(
220+
public String computeResults(
262221
final OperationParams params )
263222
throws Exception {
264-
final File propFile = getGeoWaveConfigFile(params);
265223

266-
final Properties existingProps = ConfigOptions.loadProperties(
267-
propFile,
268-
null);
224+
if (parameters.size() != 1) {
225+
throw new ParameterException(
226+
"Requires argument: <GeoServer URL>");
227+
}
228+
url = parameters.get(0);
229+
final Properties existingProps = getGeoWaveConfigProperties(params);
269230

270231
// all switches are optional
271232
if (url != null) {
@@ -292,11 +253,25 @@ public Void computeResults(
292253
getWorkspace());
293254
}
294255

256+
// save properties from ssl configurations
257+
sslConfigOptions.saveProperties(existingProps);
258+
295259
// Write properties file
296260
ConfigOptions.writeProperties(
297-
propFile,
298-
existingProps);
299-
GeoServerRestClient.invalidateInstance();
300-
return null;
261+
getGeoWaveConfigFile(params),
262+
existingProps,
263+
this.getClass(),
264+
GEOSERVER_NAMESPACE_PREFIX);
265+
GeoServerRestClient.invalidateInstance();
266+
267+
// generate a return for rest calls
268+
StringBuilder builder = new StringBuilder();
269+
for (Object key : existingProps.keySet()) {
270+
if (key.toString().startsWith(
271+
"geoserver")) {
272+
builder.append(key.toString() + "=" + existingProps.getProperty(key.toString()) + "\n");
273+
}
274+
}
275+
return builder.toString();
301276
}
302277
}

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerGetFeatureLayerCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public class GeoServerGetFeatureLayerCommand extends
3838
public void execute(
3939
final OperationParams params )
4040
throws Exception {
41-
if (parameters.size() != 1) {
42-
throw new ParameterException(
43-
"Requires argument: <layer name>");
44-
}
45-
4641
JCommander.getConsole().println(
4742
computeResults(params));
4843
}
@@ -51,6 +46,11 @@ public void execute(
5146
public String computeResults(
5247
final OperationParams params )
5348
throws Exception {
49+
if (parameters.size() != 1) {
50+
throw new ParameterException(
51+
"Requires argument: <layer name>");
52+
}
53+
5454
layerName = parameters.get(0);
5555

5656
final Response getLayerResponse = geoserverClient.getFeatureLayer(layerName);

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerGetStoreAdapterCommand.java‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,32 @@ public class GeoServerGetStoreAdapterCommand extends
3030
private List<String> parameters = new ArrayList<String>();
3131
private String storeName = null;
3232

33-
@Override
34-
public void execute(
35-
final OperationParams params )
36-
throws Exception {
37-
if (parameters.size() != 1) {
38-
throw new ParameterException(
39-
"Requires argument: <store name>");
40-
}
33+
@Override
34+
public void execute(
35+
final OperationParams params )
36+
throws Exception {
37+
List<String> adapterList = computeResults(params);
4138

42-
JCommander.getConsole().println(
43-
"Store " + storeName + " has these adapters:");
44-
for (final String adapterId : computeResults(params)) {
45-
JCommander.getConsole().println(
46-
adapterId);
47-
}
48-
}
39+
JCommander.getConsole().println(
40+
"Store " + storeName + " has these adapters:");
41+
for (final String adapterId : adapterList) {
42+
JCommander.getConsole().println(
43+
adapterId);
44+
}
45+
}
4946

50-
@Override
51-
public List<String> computeResults(
52-
final OperationParams params )
53-
throws Exception {
54-
storeName = parameters.get(0);
55-
final ArrayList<String> adapterList = geoserverClient.getStoreAdapters(
56-
storeName,
57-
null);
58-
return adapterList;
59-
}
47+
@Override
48+
public List<String> computeResults(
49+
final OperationParams params )
50+
throws Exception {
51+
if (parameters.size() != 1) {
52+
throw new ParameterException(
53+
"Requires argument: <store name>");
54+
}
55+
storeName = parameters.get(0);
56+
final List<String> adapterList = geoserverClient.getStoreAdapters(
57+
storeName,
58+
null);
59+
return adapterList;
60+
}
6061
}

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerGetStyleCommand.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ public class GeoServerGetStyleCommand extends
4040
public void execute(
4141
final OperationParams params )
4242
throws Exception {
43-
if (parameters.size() != 1) {
44-
throw new ParameterException(
45-
"Requires argument: <style name>");
46-
}
47-
4843
JCommander.getConsole().println(
4944
computeResults(params));
5045
}
@@ -53,6 +48,10 @@ public void execute(
5348
public String computeResults(
5449
final OperationParams params )
5550
throws Exception {
51+
if (parameters.size() != 1) {
52+
throw new ParameterException(
53+
"Requires argument: <style name>");
54+
}
5655
style = parameters.get(0);
5756

5857
final Response getStyleResponse = geoserverClient.getStyle(style);

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerListCoverageStoresCommand.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import javax.ws.rs.core.Response;
1414
import javax.ws.rs.core.Response.Status;
1515

16+
import com.beust.jcommander.JCommander;
1617
import com.beust.jcommander.Parameter;
1718
import com.beust.jcommander.Parameters;
1819

@@ -36,7 +37,8 @@ public class GeoServerListCoverageStoresCommand extends
3637
public void execute(
3738
final OperationParams params )
3839
throws Exception {
39-
40+
JCommander.getConsole().println(
41+
computeResults(params));
4042
}
4143

4244
@Override

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerListCoveragesCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ public class GeoServerListCoveragesCommand extends
4545
public void execute(
4646
final OperationParams params )
4747
throws Exception {
48-
if (parameters.size() != 1) {
49-
throw new ParameterException(
50-
"Requires argument: <coverage store name>");
51-
}
52-
5348
JCommander.getConsole().println(
5449
computeResults(params));
5550
}
5651

5752
@Override
5853
public String computeResults(
5954
final OperationParams params )
60-
throws Exception {
55+
throws Exception {
56+
if (parameters.size() != 1) {
57+
throw new ParameterException(
58+
"Requires argument: <coverage store name>");
59+
}
60+
6161
if ((workspace == null) || workspace.isEmpty()) {
6262
workspace = geoserverClient.getConfig().getWorkspace();
6363
}

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerRemoveCoverageCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ public class GeoServerRemoveCoverageCommand extends
4949
public void execute(
5050
final OperationParams params )
5151
throws Exception {
52-
if (parameters.size() != 1) {
53-
throw new ParameterException(
54-
"Requires argument: <coverage name>");
55-
}
56-
5752
JCommander.getConsole().println(
5853
computeResults(params));
5954
}
@@ -62,6 +57,11 @@ public void execute(
6257
public String computeResults(
6358
final OperationParams params )
6459
throws Exception {
60+
if (parameters.size() != 1) {
61+
throw new ParameterException(
62+
"Requires argument: <coverage name>");
63+
}
64+
6565
if ((workspace == null) || workspace.isEmpty()) {
6666
workspace = geoserverClient.getConfig().getWorkspace();
6767
}

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerRemoveCoverageStoreCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public class GeoServerRemoveCoverageStoreCommand extends
4343
public void execute(
4444
final OperationParams params )
4545
throws Exception {
46-
if (parameters.size() != 1) {
47-
throw new ParameterException(
48-
"Requires argument: <coverage store name>");
49-
}
50-
5146
JCommander.getConsole().println(
5247
computeResults(params));
5348
}
@@ -56,6 +51,11 @@ public void execute(
5651
public String computeResults(
5752
final OperationParams params )
5853
throws Exception {
54+
if (parameters.size() != 1) {
55+
throw new ParameterException(
56+
"Requires argument: <coverage store name>");
57+
}
58+
5959
if ((workspace == null) || workspace.isEmpty()) {
6060
workspace = geoserverClient.getConfig().getWorkspace();
6161
}

‎extensions/cli/geoserver/src/main/java/mil/nga/giat/geowave/cli/geoserver/GeoServerRemoveDatastoreCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public class GeoServerRemoveDatastoreCommand extends
4343
public void execute(
4444
final OperationParams params )
4545
throws Exception {
46-
if (parameters.size() != 1) {
47-
throw new ParameterException(
48-
"Requires argument: <datastore name>");
49-
}
50-
5146
JCommander.getConsole().println(
5247
computeResults(params));
5348
}
@@ -56,6 +51,11 @@ public void execute(
5651
public String computeResults(
5752
final OperationParams params )
5853
throws Exception {
54+
if (parameters.size() != 1) {
55+
throw new ParameterException(
56+
"Requires argument: <datastore name>");
57+
}
58+
5959
if ((workspace == null) || workspace.isEmpty()) {
6060
workspace = geoserverClient.getConfig().getWorkspace();
6161
}

0 commit comments

Comments
 (0)