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.

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

Support stream inheritance for the forked process, fixes #71 #72

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/org/codehaus/mojo/exec/ExecMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,16 @@ public class ExecMojo
@Parameter( property = "exec.outputFile" )
private File outputFile;

/**
* Program standard input, output and error streams will be inherited from the maven process.
* This allow tighter control of the streams and the console.
*
* @since 1.5.2
* @see ProcessBuilder#inheritIO()
*/
@Parameter( property = "exec.inheritIo" )
private boolean inheritIo;

/**
* <p>
* A list of arguments passed to the {@code executable}, which should be of type <code>&lt;argument&gt;</code> or
Expand Down Expand Up @@ -280,7 +290,7 @@ else if ( !StringUtils.isEmpty( argsProp ) )

commandLine.addArguments( args, false );

Executor exec = new DefaultExecutor();
Executor exec = inheritIo ? new ExtendedExecutor(inheritIo) : new DefaultExecutor();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the constructor; This will always be new ExtendedExecutor(true)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was a way to minimize code changes, but a better fix would be

Executor exec = new ExtendedExecutor(inheritIo);

exec.setWorkingDirectory( workingDirectory );
fillSuccessCodes( exec );

Expand Down
54 changes: 54 additions & 0 deletions src/main/java/org/codehaus/mojo/exec/ExtendedExecutor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.codehaus.mojo.exec;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/

import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;

import java.io.File;
import java.io.IOException;
import java.util.Map;

/**
* @author Guillaume Nodet (gnodet@gmail.com)
*/
public class ExtendedExecutor extends DefaultExecutor {

private final boolean inheritIo;

public ExtendedExecutor(boolean inheritIo) {
this.inheritIo = inheritIo;
}

@Override
protected Process launch(CommandLine command, Map<String, String> env, File dir) throws IOException {
if (dir != null && !dir.exists()) {
throw new IOException(dir + " doesn't exist.");
}
ProcessBuilder pb = new ProcessBuilder(command.toStrings());
pb.environment().putAll(env);
pb.directory(dir);
if (inheritIo) {
pb.inheritIO();
}
return pb.start();
}

}