Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix port configuration in sitegen:serve #1010

Merged
merged 2 commits into from
Jan 5, 2024
Merged

Fix port configuration in sitegen:serve #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7441e
Fix port configuration in sitegen:serve
romain-grecourt Jan 5, 2024
35f9d58
Update sitegen README to document the serve goal.
romain-grecourt Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions maven-plugins/sitegen-maven-plugin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ Creates the site archive.
The parameter `siteArchiveSkip` is mapped to a user property:
`sitegen.siteArchiveSkip`.

## Goal: `serve`

Serve the site.

### Optional Parameters

| Property | Type | Default<br/>Value | Description |
|---------------------|---------|-----------------------------------|----------------------------------------------------------|
| siteOutputDirectory | File | `${project.build.directory}/site` | Directory containing the generate site files to archive. |
| sitePort | int | 8080 | TCP port to use. |
| siteServeSkip | Boolean | `false` | Skip this goal execution |

All parameters are mapped to user properties of the form `sitegen.PROPERTY`.

## Goal: `preprocess-adoc`

Pre-includes included text specified by AsciiDoc `include::` directives into
Expand Down
14 changes: 11 additions & 3 deletions ...plugins/sitegen-maven-plugin/src/main/java/io/helidon/build/maven/sitegen/SiteServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates.
* Copyright (c) 2023, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -52,7 +52,7 @@ public final class SiteServer {
public SiteServer(int port, Path dir) {
this.port = port;
try {
server = HttpServer.create(new InetSocketAddress(8080), 0);
server = HttpServer.create(new InetSocketAddress(port), 0);
server.createContext("/", new Handler(dir));
server.setExecutor(Executors.newWorkStealingPool());
} catch (IOException ex) {
Expand Down Expand Up @@ -95,7 +95,15 @@ public void stop() {
* @param args args
*/
public static void main(String[] args) {
new SiteServer(8080, Path.of(args[0])).start();
if (args.length > 0) {
Path dir = Path.of(args[0]);
int port = 8080;
if (args.length > 1) {
port = Integer.parseInt(args[1]);
}
new SiteServer(port, dir).start();
}
throw new IllegalArgumentException("usage: dir [port]");
}

private static final class Handler implements HttpHandler {
Expand Down