apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-15 14:50:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove --install option now that we offer a distro containing both client and server

Browse Source
This commit is contained in:
Peter Palaga
2020-08-14 11:12:40 +02:00
parent 922403171e
commit 83dacbf0b1
4 changed files with 1 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
View File

@@ -16,7 +16,6 @@
package org.jboss.fuse.mvnd.client; package org.jboss.fuse.mvnd.client;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Instant; import java.time.Instant;
@@ -69,35 +68,6 @@ public class DefaultClient implements Client {
} }
} }
private static void install(boolean overwrite, final Properties commandLineProperties, String version) {
final String rawZipUri = Environment.MVND_DIST_URI
.commandLineProperty(() -> commandLineProperties)
.orEnvironmentVariable()
.orSystemProperty()
.orDefault(() -> "https://github.com/mvndaemon/mvnd/releases/download/" + version + "/mvnd-dist.zip")
.asString();
final URI zipUri = URI.create(rawZipUri);
final Path mvndHome = Environment.MVND_HOME
.commandLineProperty(() -> commandLineProperties)
.orEnvironmentVariable()
.orSystemProperty()
.orDefault(() -> Paths.get(System.getProperty("user.home")).resolve(".m2/mvnd/" + version).toString())
.asPath()
.toAbsolutePath().normalize();
final Path javaHome = Environment.JAVA_HOME
.systemProperty() // only write java.home to mvnd.properties if it was explicitly set on command line
// via -Djava.home=...
.asPath();
final Path mvndPropertiesPath = Environment.MVND_PROPERTIES_PATH
.commandLineProperty(() -> commandLineProperties)
.orEnvironmentVariable()
.orSystemProperty()
.orDefault(() -> Paths.get(System.getProperty("user.home")).resolve(".m2/mvnd.properties").toString())
.asPath()
.toAbsolutePath().normalize();
Installer.installServer(zipUri, mvndPropertiesPath, mvndHome, javaHome, overwrite);
}
public DefaultClient(Supplier<ClientLayout> layout, BuildProperties buildProperties) { public DefaultClient(Supplier<ClientLayout> layout, BuildProperties buildProperties) {
this.lazyLayout = layout; this.lazyLayout = layout;
this.buildProperties = buildProperties; this.buildProperties = buildProperties;
@@ -111,7 +81,6 @@ public class DefaultClient implements Client {
boolean version = false; boolean version = false;
boolean showVersion = false; boolean showVersion = false;
boolean debug = false; boolean debug = false;
boolean install = false;
final Properties commandLineProperties = new Properties(); final Properties commandLineProperties = new Properties();
for (String arg : argv) { for (String arg : argv) {
switch (arg) { switch (arg) {
@@ -132,8 +101,7 @@ public class DefaultClient implements Client {
args.add(arg); args.add(arg);
break; break;
case "--install": case "--install":
install = true; throw new IllegalStateException("The --install option was removed in mvnd 0.0.2");
break;
default: default:
if (arg.startsWith("-D")) { if (arg.startsWith("-D")) {
final int eqPos = arg.indexOf('='); final int eqPos = arg.indexOf('=');
@@ -148,11 +116,6 @@ public class DefaultClient implements Client {
} }
} }
if (install) {
install(false, commandLineProperties, buildProperties.getVersion());
return new DefaultResult(argv, null);
}
// Print version if needed // Print version if needed
if (version || showVersion || debug) { if (version || showVersion || debug) {
final String nativeSuffix = Environment.isNative() ? " (native)" : ""; final String nativeSuffix = Environment.isNative() ? " (native)" : "";

244
client/src/main/java/org/jboss/fuse/mvnd/client/Installer.java
View File

@@ -1,244 +0,0 @@
/*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFilePermission;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Installer {
private static final Logger LOG = LoggerFactory.getLogger(Installer.class);
private static final int BUFFER_SIZE = 4096;
private static final int MAX_PERMISSIONS = 0777;
private static final int PROGRESS_STEP_BYTES = 1024 * 1024;
public static void installServer(URI zipUri, Path mvndPropsPath, Path mvndHome, Path javaHome, boolean overwrite) {
final boolean mvndHomeExists = Files.exists(mvndHome);
if (!overwrite && mvndHomeExists) {
throw new IllegalStateException(
"Cannot install if mvnd.home " + mvndHome + " exists. Delete it if you want to reinstall.");
}
if (!overwrite && Files.exists(mvndPropsPath)) {
throw new IllegalStateException(
"Cannot install if " + mvndPropsPath + " exists. Delete it if you want to reinstall.");
}
deleteIfExists(mvndHome);
deleteIfExists(mvndPropsPath);
final Path localZip = download(zipUri);
unzip(localZip, mvndHome);
writeMvndProperties(mvndPropsPath, mvndHome, javaHome);
}
static void deleteIfExists(Path path) {
if (Files.isRegularFile(path)) {
try {
Files.delete(path);
} catch (IOException e) {
throw new RuntimeException("Could not delete " + path);
}
} else if (Files.isDirectory(path)) {
try (Stream<Path> files = Files.walk(path)) {
files.sorted(Comparator.reverseOrder())
.forEach(p -> {
try {
Files.delete(p);
} catch (Exception e) {
throw new RuntimeException("Could not delete " + p, e);
}
});
} catch (IOException e) {
throw new RuntimeException("Could not delete " + path, e);
}
}
}
static void writeMvndProperties(Path mvndPropsPath, Path mvndHome, Path javaHome) {
LOG.info("Writing {}", mvndPropsPath);
final String template = readTemplate();
final String javaHomeLine = javaHome == null ? "" : "java.home = " + escape(javaHome.toString());
final String content = String.format(template, escape(mvndHome.toString()), javaHomeLine);
try {
Files.write(mvndPropsPath, content.getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new RuntimeException("Could not write to " + mvndPropsPath);
}
}
static String escape(String string) {
return string.replace("\\", "\\\\");
}
static String readTemplate() {
try (InputStream in = Installer.class.getResourceAsStream("mvnd.properties.template");
ByteArrayOutputStream out = new ByteArrayOutputStream(256)) {
copy(in, out, false);
return new String(out.toByteArray(), StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException("Could not read build.properties");
}
}
static void unzip(Path localZip, Path destinationDir) {
if (LOG.isDebugEnabled()) {
LOG.debug("Unpacking {} to {}", localZip, destinationDir);
} else {
LOG.info("Unpacking to {}", destinationDir);
}
try {
Files.createDirectories(destinationDir);
} catch (IOException e) {
throw new RuntimeException("Could not create directories " + destinationDir, e);
}
try (ZipFile zip = new ZipFile(Files.newByteChannel(localZip))) {
final Map<Integer, Set<PosixFilePermission>> permissionCache = new HashMap<>();
final Enumeration<ZipArchiveEntry> entries = zip.getEntries();
while (entries.hasMoreElements()) {
final ZipArchiveEntry entry = entries.nextElement();
final Path dest = destinationDir.resolve(entry.getName()).normalize();
if (!dest.startsWith(destinationDir)) {
/* Avoid writing to paths outside of mvndHome */
throw new IllegalStateException("Possibly tainted ZIP entry name " + entry.getName()
+ " would have to be unpacked outside of " + destinationDir);
}
if (entry.isDirectory()) {
Files.createDirectories(dest);
} else {
Files.createDirectories(dest.getParent());
try (
InputStream in = new BufferedInputStream(zip.getInputStream(entry), BUFFER_SIZE);
OutputStream out = new BufferedOutputStream(Files.newOutputStream(dest), BUFFER_SIZE)) {
copy(in, out, false);
} catch (IOException e) {
throw new RuntimeException(
"Could not unzip entry " + entry.getName() + " from " + localZip + " to " + dest);
}
}
final int mode = (int) (entry.getUnixMode() & MAX_PERMISSIONS);
if (mode != 0) {
final PosixFileAttributeView attributes = Files.getFileAttributeView(dest, PosixFileAttributeView.class);
if (attributes != null) {
Files.setPosixFilePermissions(dest, permissionCache.computeIfAbsent(mode, Installer::toPermissionSet));
}
}
Files.setLastModifiedTime(dest, FileTime.from(entry.getTime(), TimeUnit.MILLISECONDS));
}
} catch (IOException e) {
throw new RuntimeException("Could not unzip " + localZip + " to " + destinationDir, e);
}
}
static Path download(URI zipUri) {
try {
final Path localZip = Files.createTempFile("", "-mvnd-dist.zip");
if (LOG.isDebugEnabled()) {
LOG.debug("Downloading {} to {}", zipUri, localZip);
} else {
LOG.info("Downloading {}", zipUri);
}
try (
InputStream in = new BufferedInputStream(zipUri.toURL().openStream(), BUFFER_SIZE);
OutputStream out = new BufferedOutputStream(Files.newOutputStream(localZip), BUFFER_SIZE)) {
copy(in, out, LOG.isInfoEnabled());
} catch (IOException e) {
throw new RuntimeException("Could not download " + zipUri + " to " + localZip, e);
}
return localZip;
} catch (IOException e) {
throw new RuntimeException("Could not create temp file", e);
}
}
static void copy(InputStream in, OutputStream out, boolean printProgress) throws IOException {
final byte buf[] = new byte[BUFFER_SIZE];
int len;
long byteCount = 0;
long nextStep = PROGRESS_STEP_BYTES;
while ((len = in.read(buf)) >= 0) {
if (printProgress) {
byteCount += len;
if (byteCount >= nextStep) {
nextStep += PROGRESS_STEP_BYTES;
System.out.print('.');
}
}
out.write(buf, 0, len);
}
if (printProgress) {
System.out.println();
}
}
static Set<PosixFilePermission> toPermissionSet(Integer mode) {
final Set<PosixFilePermission> result = EnumSet.noneOf(PosixFilePermission.class);
/* others */
if ((mode & 0001) != 0) {
result.add(PosixFilePermission.OTHERS_EXECUTE);
}
if ((mode & 0002) != 0) {
result.add(PosixFilePermission.OTHERS_WRITE);
}
if ((mode & 0004) != 0) {
result.add(PosixFilePermission.OTHERS_READ);
}
/* group */
if ((mode & 0010) != 0) {
result.add(PosixFilePermission.GROUP_EXECUTE);
}
if ((mode & 0020) != 0) {
result.add(PosixFilePermission.GROUP_WRITE);
}
if ((mode & 0040) != 0) {
result.add(PosixFilePermission.GROUP_READ);
}
/* user */
if ((mode & 0100) != 0) {
result.add(PosixFilePermission.OWNER_EXECUTE);
}
if ((mode & 0200) != 0) {
result.add(PosixFilePermission.OWNER_WRITE);
}
if ((mode & 0400) != 0) {
result.add(PosixFilePermission.OWNER_READ);
}
return Collections.unmodifiableSet(result);
}
}

89
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/InstallDaemonNativeIT.java
View File

@@ -1,89 +0,0 @@
/*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFilePermission;
import java.util.Objects;
import java.util.Set;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.client.BuildProperties;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.ClientOutput;
import org.jboss.fuse.mvnd.client.Environment;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.TestLayout;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@MvndNativeTest(projectDir = "src/test/projects/single-module")
public class InstallDaemonNativeIT {
@Inject
Client client;
@Inject
TestLayout layout;
@Test
void installDaemon() throws IOException, InterruptedException {
final Path testDir = layout.getTestDir();
final Path mvndPropertiesPath = testDir.resolve("installation-mvnd.properties");
final Path mavenHome = testDir.resolve("installation-maven-home");
Assertions.assertThat(mvndPropertiesPath).doesNotExist();
Assertions.assertThat(mavenHome).doesNotExist();
final ClientOutput o = Mockito.mock(ClientOutput.class);
final Path mvndDistPath = Paths.get(Objects.requireNonNull(System.getProperty("mvnd.dist.path")))
.toAbsolutePath()
.normalize();
Assertions.assertThat(mvndDistPath).exists();
final String mvndDistUri = mvndDistPath.toUri().toString();
client.execute(o,
"--install",
Environment.MVND_DIST_URI.asCommandLineProperty(mvndDistUri),
Environment.MVND_PROPERTIES_PATH.asCommandLineProperty(mvndPropertiesPath.toString()),
Environment.JAVA_HOME.asCommandLineProperty(layout.javaHome().toString()),
Environment.MVND_HOME.asCommandLineProperty(mavenHome.toString()))
.assertSuccess();
Assertions.assertThat(mvndPropertiesPath).exists();
Assertions.assertThat(mavenHome).exists();
final Path mvndShPath = mavenHome.resolve("bin/mvnd");
Assertions.assertThat(mvndShPath).exists();
if (!System.getProperty("os.name").toLowerCase().contains("windows")) {
final PosixFileAttributeView attributes = Files.getFileAttributeView(mvndShPath, PosixFileAttributeView.class);
Assertions.assertThat(attributes).isNotNull();
final Set<PosixFilePermission> permissions = attributes.readAttributes().permissions();
Assertions.assertThat(permissions).contains(PosixFilePermission.GROUP_EXECUTE, PosixFilePermission.OWNER_EXECUTE,
PosixFilePermission.OTHERS_EXECUTE);
}
final String version = BuildProperties.getInstance().getVersion();
Assertions.assertThat(mavenHome.resolve("lib/ext/mvnd-client-" + version + ".jar")).exists();
Assertions.assertThat(mavenHome.resolve("lib/ext/mvnd-daemon-" + version + ".jar")).exists();
}
}

23
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/InstallDaemonTest.java
View File

@@ -1,23 +0,0 @@
/*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/single-module")
public class InstallDaemonTest extends InstallDaemonNativeIT {
}